From e40186332e087dd20d4d1fbe11d7329b1fe64f5b Mon Sep 17 00:00:00 2001
From: Elad Alon <eladalon@webrtc.org>
Date: Fri, 2 Nov 2018 14:56:12 +0100
Subject: [PATCH] Change to RtcEvent::Copy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until this CL, RtcEvent::Copy() was a virtual function returning
a std::unique_ptr<RtcEvent>, which was used only in unit tests.
Whenever it was used, the exact sub-class was known, so returning
as a std::unique_ptr<RtcEvent> lost information, but the
additional flexibility of calling Copy on an unknown RtcEvent
was never used. This CL changes the function to a non-virtual one.

Bug: webrtc:8111
Change-Id: I30dbea5f4ec84c41282550aa77a855bfae9ffbd1
Reviewed-on: https://webrtc-review.googlesource.com/c/109140
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25487}
---
 logging/rtc_event_log/events/rtc_event.h                    | 2 --
 logging/rtc_event_log/events/rtc_event_alr_state.cc         | 4 ++--
 logging/rtc_event_log/events/rtc_event_alr_state.h          | 2 +-
 .../events/rtc_event_audio_network_adaptation.cc            | 3 ++-
 .../events/rtc_event_audio_network_adaptation.h             | 2 +-
 logging/rtc_event_log/events/rtc_event_audio_playout.cc     | 5 +++--
 logging/rtc_event_log/events/rtc_event_audio_playout.h      | 2 +-
 .../events/rtc_event_audio_receive_stream_config.cc         | 5 +++--
 .../events/rtc_event_audio_receive_stream_config.h          | 2 +-
 .../events/rtc_event_audio_send_stream_config.cc            | 6 ++++--
 .../events/rtc_event_audio_send_stream_config.h             | 2 +-
 .../events/rtc_event_bwe_update_delay_based.cc              | 6 ++++--
 .../rtc_event_log/events/rtc_event_bwe_update_delay_based.h | 2 +-
 .../rtc_event_log/events/rtc_event_bwe_update_loss_based.cc | 6 ++++--
 .../rtc_event_log/events/rtc_event_bwe_update_loss_based.h  | 2 +-
 .../rtc_event_log/events/rtc_event_ice_candidate_pair.cc    | 6 ++++--
 logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h | 2 +-
 .../events/rtc_event_ice_candidate_pair_config.cc           | 6 ++++--
 .../events/rtc_event_ice_candidate_pair_config.h            | 2 +-
 .../rtc_event_log/events/rtc_event_probe_cluster_created.cc | 6 ++++--
 .../rtc_event_log/events/rtc_event_probe_cluster_created.h  | 2 +-
 .../rtc_event_log/events/rtc_event_probe_result_failure.cc  | 6 ++++--
 .../rtc_event_log/events/rtc_event_probe_result_failure.h   | 2 +-
 .../rtc_event_log/events/rtc_event_probe_result_success.cc  | 6 ++++--
 .../rtc_event_log/events/rtc_event_probe_result_success.h   | 2 +-
 .../rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc  | 6 ++++--
 .../rtc_event_log/events/rtc_event_rtcp_packet_incoming.h   | 2 +-
 .../rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc  | 6 ++++--
 .../rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h   | 2 +-
 .../rtc_event_log/events/rtc_event_rtp_packet_incoming.cc   | 6 ++++--
 .../rtc_event_log/events/rtc_event_rtp_packet_incoming.h    | 2 +-
 .../rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc   | 6 ++++--
 .../rtc_event_log/events/rtc_event_rtp_packet_outgoing.h    | 2 +-
 .../events/rtc_event_video_receive_stream_config.cc         | 5 +++--
 .../events/rtc_event_video_receive_stream_config.h          | 2 +-
 .../events/rtc_event_video_send_stream_config.cc            | 6 ++++--
 .../events/rtc_event_video_send_stream_config.h             | 2 +-
 37 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/logging/rtc_event_log/events/rtc_event.h b/logging/rtc_event_log/events/rtc_event.h
index 21d6e48e0f..5e6a4a2711 100644
--- a/logging/rtc_event_log/events/rtc_event.h
+++ b/logging/rtc_event_log/events/rtc_event.h
@@ -57,8 +57,6 @@ class RtcEvent {
 
   virtual bool IsConfigEvent() const = 0;
 
-  virtual std::unique_ptr<RtcEvent> Copy() const = 0;
-
   const int64_t timestamp_us_;
 
  protected:
diff --git a/logging/rtc_event_log/events/rtc_event_alr_state.cc b/logging/rtc_event_log/events/rtc_event_alr_state.cc
index c1f1b39532..8e5c2ca82f 100644
--- a/logging/rtc_event_log/events/rtc_event_alr_state.cc
+++ b/logging/rtc_event_log/events/rtc_event_alr_state.cc
@@ -28,8 +28,8 @@ bool RtcEventAlrState::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventAlrState::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventAlrState(*this));
+std::unique_ptr<RtcEventAlrState> RtcEventAlrState::Copy() const {
+  return absl::WrapUnique<RtcEventAlrState>(new RtcEventAlrState(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_alr_state.h b/logging/rtc_event_log/events/rtc_event_alr_state.h
index e737c915e1..5749e109c0 100644
--- a/logging/rtc_event_log/events/rtc_event_alr_state.h
+++ b/logging/rtc_event_log/events/rtc_event_alr_state.h
@@ -26,7 +26,7 @@ class RtcEventAlrState final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventAlrState> Copy() const;
 
   const bool in_alr_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc
index dcf2d7de59..c51be776af 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc
+++ b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.cc
@@ -36,7 +36,8 @@ bool RtcEventAudioNetworkAdaptation::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventAudioNetworkAdaptation::Copy() const {
+std::unique_ptr<RtcEventAudioNetworkAdaptation>
+RtcEventAudioNetworkAdaptation::Copy() const {
   return absl::WrapUnique(new RtcEventAudioNetworkAdaptation(*this));
 }
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h
index 65fbad8621..08c6026087 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h
+++ b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h
@@ -29,7 +29,7 @@ class RtcEventAudioNetworkAdaptation final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventAudioNetworkAdaptation> Copy() const;
 
   const std::unique_ptr<const AudioEncoderRuntimeConfig> config_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.cc b/logging/rtc_event_log/events/rtc_event_audio_playout.cc
index a9643ba868..6c4aa98d3e 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_playout.cc
+++ b/logging/rtc_event_log/events/rtc_event_audio_playout.cc
@@ -27,8 +27,9 @@ bool RtcEventAudioPlayout::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventAudioPlayout::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventAudioPlayout(*this));
+std::unique_ptr<RtcEventAudioPlayout> RtcEventAudioPlayout::Copy() const {
+  return absl::WrapUnique<RtcEventAudioPlayout>(
+      new RtcEventAudioPlayout(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.h b/logging/rtc_event_log/events/rtc_event_audio_playout.h
index c6bcb66ff5..068e91e3b4 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_playout.h
+++ b/logging/rtc_event_log/events/rtc_event_audio_playout.h
@@ -27,7 +27,7 @@ class RtcEventAudioPlayout final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventAudioPlayout> Copy() const;
 
   const uint32_t ssrc_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc
index fee7c3c766..7f78a392c8 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc
+++ b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc
@@ -36,9 +36,10 @@ bool RtcEventAudioReceiveStreamConfig::IsConfigEvent() const {
   return true;
 }
 
-std::unique_ptr<RtcEvent> RtcEventAudioReceiveStreamConfig::Copy() const {
+std::unique_ptr<RtcEventAudioReceiveStreamConfig>
+RtcEventAudioReceiveStreamConfig::Copy() const {
   auto config_copy = absl::make_unique<rtclog::StreamConfig>(*config_);
-  return absl::WrapUnique<RtcEvent>(
+  return absl::WrapUnique<RtcEventAudioReceiveStreamConfig>(
       new RtcEventAudioReceiveStreamConfig(*this));
 }
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h
index 2757650314..098f10b5c9 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h
+++ b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h
@@ -31,7 +31,7 @@ class RtcEventAudioReceiveStreamConfig final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventAudioReceiveStreamConfig> Copy() const;
 
   const std::unique_ptr<const rtclog::StreamConfig> config_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc
index 47939c7bdc..83dbe74d68 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc
+++ b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc
@@ -36,9 +36,11 @@ bool RtcEventAudioSendStreamConfig::IsConfigEvent() const {
   return true;
 }
 
-std::unique_ptr<RtcEvent> RtcEventAudioSendStreamConfig::Copy() const {
+std::unique_ptr<RtcEventAudioSendStreamConfig>
+RtcEventAudioSendStreamConfig::Copy() const {
   auto config_copy = absl::make_unique<rtclog::StreamConfig>(*config_);
-  return absl::WrapUnique<RtcEvent>(new RtcEventAudioSendStreamConfig(*this));
+  return absl::WrapUnique<RtcEventAudioSendStreamConfig>(
+      new RtcEventAudioSendStreamConfig(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h
index b248a61915..a0758a3f4e 100644
--- a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h
+++ b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h
@@ -31,7 +31,7 @@ class RtcEventAudioSendStreamConfig final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventAudioSendStreamConfig> Copy() const;
 
   const std::unique_ptr<const rtclog::StreamConfig> config_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc
index 8c17971260..dcc87421f8 100644
--- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc
+++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc
@@ -36,8 +36,10 @@ bool RtcEventBweUpdateDelayBased::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventBweUpdateDelayBased::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventBweUpdateDelayBased(*this));
+std::unique_ptr<RtcEventBweUpdateDelayBased> RtcEventBweUpdateDelayBased::Copy()
+    const {
+  return absl::WrapUnique<RtcEventBweUpdateDelayBased>(
+      new RtcEventBweUpdateDelayBased(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h
index 0fb5c023a6..3919a51484 100644
--- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h
+++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h
@@ -30,7 +30,7 @@ class RtcEventBweUpdateDelayBased final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventBweUpdateDelayBased> Copy() const;
 
   const int32_t bitrate_bps_;
   const BandwidthUsage detector_state_;
diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc
index b0e72ddb0a..8453238cf9 100644
--- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc
+++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc
@@ -38,8 +38,10 @@ bool RtcEventBweUpdateLossBased::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventBweUpdateLossBased::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventBweUpdateLossBased(*this));
+std::unique_ptr<RtcEventBweUpdateLossBased> RtcEventBweUpdateLossBased::Copy()
+    const {
+  return absl::WrapUnique<RtcEventBweUpdateLossBased>(
+      new RtcEventBweUpdateLossBased(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h
index 58bc2f1056..49f04d14b9 100644
--- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h
+++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h
@@ -29,7 +29,7 @@ class RtcEventBweUpdateLossBased final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventBweUpdateLossBased> Copy() const;
 
   const int32_t bitrate_bps_;
   const uint8_t fraction_loss_;
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc
index fa32de68d5..9c31737ea5 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc
@@ -35,8 +35,10 @@ bool RtcEventIceCandidatePair::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventIceCandidatePair::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventIceCandidatePair(*this));
+std::unique_ptr<RtcEventIceCandidatePair> RtcEventIceCandidatePair::Copy()
+    const {
+  return absl::WrapUnique<RtcEventIceCandidatePair>(
+      new RtcEventIceCandidatePair(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h
index f49a0d1792..e03180420c 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h
@@ -36,7 +36,7 @@ class RtcEventIceCandidatePair final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventIceCandidatePair> Copy() const;
 
   const IceCandidatePairEventType type_;
   const uint32_t candidate_pair_id_;
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc
index f89de7740c..fbb8a73dfb 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc
@@ -64,8 +64,10 @@ bool RtcEventIceCandidatePairConfig::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventIceCandidatePairConfig::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventIceCandidatePairConfig(*this));
+std::unique_ptr<RtcEventIceCandidatePairConfig>
+RtcEventIceCandidatePairConfig::Copy() const {
+  return absl::WrapUnique<RtcEventIceCandidatePairConfig>(
+      new RtcEventIceCandidatePairConfig(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
index 1f6eb8ceb0..6b6eb500d5 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
@@ -92,7 +92,7 @@ class RtcEventIceCandidatePairConfig final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventIceCandidatePairConfig> Copy() const;
 
   const IceCandidatePairConfigType type_;
   const uint32_t candidate_pair_id_;
diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc
index a60765dbd0..c11a6ce78e 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc
+++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc
@@ -39,8 +39,10 @@ bool RtcEventProbeClusterCreated::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventProbeClusterCreated::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventProbeClusterCreated(*this));
+std::unique_ptr<RtcEventProbeClusterCreated> RtcEventProbeClusterCreated::Copy()
+    const {
+  return absl::WrapUnique<RtcEventProbeClusterCreated>(
+      new RtcEventProbeClusterCreated(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h
index 426668698b..c1bdabcdb4 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h
+++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h
@@ -30,7 +30,7 @@ class RtcEventProbeClusterCreated final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventProbeClusterCreated> Copy() const;
 
   const int32_t id_;
   const int32_t bitrate_bps_;
diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc
index aa6091ca77..295003ae8d 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc
+++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.cc
@@ -33,8 +33,10 @@ bool RtcEventProbeResultFailure::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventProbeResultFailure::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventProbeResultFailure(*this));
+std::unique_ptr<RtcEventProbeResultFailure> RtcEventProbeResultFailure::Copy()
+    const {
+  return absl::WrapUnique<RtcEventProbeResultFailure>(
+      new RtcEventProbeResultFailure(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h
index bf0aceb62a..fe45501286 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h
+++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h
@@ -34,7 +34,7 @@ class RtcEventProbeResultFailure final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventProbeResultFailure> Copy() const;
 
   const int32_t id_;
   const ProbeFailureReason failure_reason_;
diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc
index 55907295de..d5f9e2f780 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_result_success.cc
+++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.cc
@@ -32,8 +32,10 @@ bool RtcEventProbeResultSuccess::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventProbeResultSuccess::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventProbeResultSuccess(*this));
+std::unique_ptr<RtcEventProbeResultSuccess> RtcEventProbeResultSuccess::Copy()
+    const {
+  return absl::WrapUnique<RtcEventProbeResultSuccess>(
+      new RtcEventProbeResultSuccess(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.h b/logging/rtc_event_log/events/rtc_event_probe_result_success.h
index 10b1969407..783e20aac0 100644
--- a/logging/rtc_event_log/events/rtc_event_probe_result_success.h
+++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.h
@@ -27,7 +27,7 @@ class RtcEventProbeResultSuccess final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventProbeResultSuccess> Copy() const;
 
   const int32_t id_;
   const int32_t bitrate_bps_;
diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc
index 119938c7f7..45a418f1f6 100644
--- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc
+++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.cc
@@ -33,8 +33,10 @@ bool RtcEventRtcpPacketIncoming::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventRtcpPacketIncoming::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventRtcpPacketIncoming(*this));
+std::unique_ptr<RtcEventRtcpPacketIncoming> RtcEventRtcpPacketIncoming::Copy()
+    const {
+  return absl::WrapUnique<RtcEventRtcpPacketIncoming>(
+      new RtcEventRtcpPacketIncoming(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h
index 47b70c7488..ffe9830295 100644
--- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h
+++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h
@@ -29,7 +29,7 @@ class RtcEventRtcpPacketIncoming final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventRtcpPacketIncoming> Copy() const;
 
   rtc::Buffer packet_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc
index 4085ac0f31..b583e5614a 100644
--- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc
+++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.cc
@@ -33,8 +33,10 @@ bool RtcEventRtcpPacketOutgoing::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventRtcpPacketOutgoing::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventRtcpPacketOutgoing(*this));
+std::unique_ptr<RtcEventRtcpPacketOutgoing> RtcEventRtcpPacketOutgoing::Copy()
+    const {
+  return absl::WrapUnique<RtcEventRtcpPacketOutgoing>(
+      new RtcEventRtcpPacketOutgoing(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h
index d1a54e1c98..42df64b97c 100644
--- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h
+++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h
@@ -29,7 +29,7 @@ class RtcEventRtcpPacketOutgoing final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventRtcpPacketOutgoing> Copy() const;
 
   rtc::Buffer packet_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc
index d0e511825f..54cf1e387b 100644
--- a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc
+++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.cc
@@ -44,8 +44,10 @@ bool RtcEventRtpPacketIncoming::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventRtpPacketIncoming::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventRtpPacketIncoming(*this));
+std::unique_ptr<RtcEventRtpPacketIncoming> RtcEventRtpPacketIncoming::Copy()
+    const {
+  return absl::WrapUnique<RtcEventRtpPacketIncoming>(
+      new RtcEventRtpPacketIncoming(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h
index edc506b90c..bc622de80e 100644
--- a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h
+++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h
@@ -29,7 +29,7 @@ class RtcEventRtpPacketIncoming final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventRtpPacketIncoming> Copy() const;
 
   size_t packet_length() const {
     return payload_length_ + header_length_ + padding_length_;
diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
index 3f86c3f0fc..9c77d55fca 100644
--- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
+++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.cc
@@ -47,8 +47,10 @@ bool RtcEventRtpPacketOutgoing::IsConfigEvent() const {
   return false;
 }
 
-std::unique_ptr<RtcEvent> RtcEventRtpPacketOutgoing::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventRtpPacketOutgoing(*this));
+std::unique_ptr<RtcEventRtpPacketOutgoing> RtcEventRtpPacketOutgoing::Copy()
+    const {
+  return absl::WrapUnique<RtcEventRtpPacketOutgoing>(
+      new RtcEventRtpPacketOutgoing(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h
index c21e6133c4..ecb678e92e 100644
--- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h
+++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h
@@ -30,7 +30,7 @@ class RtcEventRtpPacketOutgoing final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventRtpPacketOutgoing> Copy() const;
 
   size_t packet_length() const {
     return payload_length_ + header_length_ + padding_length_;
diff --git a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc
index 7f4dd9b7b8..97d94a3d91 100644
--- a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc
+++ b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.cc
@@ -35,8 +35,9 @@ bool RtcEventVideoReceiveStreamConfig::IsConfigEvent() const {
   return true;
 }
 
-std::unique_ptr<RtcEvent> RtcEventVideoReceiveStreamConfig::Copy() const {
-  return absl::WrapUnique<RtcEvent>(
+std::unique_ptr<RtcEventVideoReceiveStreamConfig>
+RtcEventVideoReceiveStreamConfig::Copy() const {
+  return absl::WrapUnique<RtcEventVideoReceiveStreamConfig>(
       new RtcEventVideoReceiveStreamConfig(*this));
 }
 
diff --git a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h
index c6263c3fdb..487969196a 100644
--- a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h
+++ b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h
@@ -28,7 +28,7 @@ class RtcEventVideoReceiveStreamConfig final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventVideoReceiveStreamConfig> Copy() const;
 
   const std::unique_ptr<const rtclog::StreamConfig> config_;
 
diff --git a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc
index b4b78a8a52..dc4b167438 100644
--- a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc
+++ b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc
@@ -35,8 +35,10 @@ bool RtcEventVideoSendStreamConfig::IsConfigEvent() const {
   return true;
 }
 
-std::unique_ptr<RtcEvent> RtcEventVideoSendStreamConfig::Copy() const {
-  return absl::WrapUnique<RtcEvent>(new RtcEventVideoSendStreamConfig(*this));
+std::unique_ptr<RtcEventVideoSendStreamConfig>
+RtcEventVideoSendStreamConfig::Copy() const {
+  return absl::WrapUnique<RtcEventVideoSendStreamConfig>(
+      new RtcEventVideoSendStreamConfig(*this));
 }
 
 }  // namespace webrtc
diff --git a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h
index 3472f8855b..22c89efe8f 100644
--- a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h
+++ b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h
@@ -28,7 +28,7 @@ class RtcEventVideoSendStreamConfig final : public RtcEvent {
 
   bool IsConfigEvent() const override;
 
-  std::unique_ptr<RtcEvent> Copy() const override;
+  std::unique_ptr<RtcEventVideoSendStreamConfig> Copy() const;
 
   const std::unique_ptr<const rtclog::StreamConfig> config_;