Mark template class RefCountedObject as final.

pc/rtpsenderreceiver_unittest.cc

Index: pc/rtpsenderreceiver_unittest.cc
diff --git a/pc/rtpsenderreceiver_unittest.cc b/pc/rtpsenderreceiver_unittest.cc
index 5b0b59ec0a4f3d31e904fde6204afaf321903d6d..5281e701810a343736a33bd97fed36bf9f6578c2 100644
--- a/pc/rtpsenderreceiver_unittest.cc
+++ b/pc/rtpsenderreceiver_unittest.cc
@@ -132,8 +132,10 @@ class RtpSenderReceiverTest : public testing::Test,
     audio_track_ = AudioTrack::Create(kAudioTrackId, source);
     EXPECT_TRUE(local_stream_->AddTrack(audio_track_));
     audio_rtp_sender_ =
-        new AudioRtpSender(local_stream_->GetAudioTracks()[0],
-                           {local_stream_->label()}, voice_channel_, nullptr);
+        new rtc::RefCountedObject<AudioRtpSender>(
+            local_stream_->GetAudioTracks()[0],
+            std::vector<std::string>({local_stream_->label()}),

[nisse-webrtc, 2017/09/18 08:28:57]

The compiler template magic failed without explicit construction of this vector,
it said it could infer the argument for the argument 
|{local_stream->label()}|.

Is there any nice way to fix that, and make RefCountedObject forward initializer
lists to the constructor of the underlying type?

[kwiberg-webrtc, 2017/09/18 09:13:50]

Not that I know of. See e.g.
https://stackoverflow.com/questions/28370970/forwarding-initializer-list-expr...

[nisse-webrtc, 2017/09/18 09:20:05]

Hmm. From there, it looks like it might work to write
std::initializer_list(local_stream_->label()) instead of std::vector.... But
that wouldn't improve readability, I'm afraid, even f it works.

+            voice_channel_, nullptr);
     audio_rtp_sender_->SetSsrc(kAudioSsrc);
     audio_rtp_sender_->GetOnDestroyedSignal()->connect(
         this, &RtpSenderReceiverTest::OnAudioSenderDestroyed);
@@ -147,8 +149,9 @@ class RtpSenderReceiverTest : public testing::Test,
   void CreateVideoRtpSender(bool is_screencast) {
     AddVideoTrack(is_screencast);
     video_rtp_sender_ =
-        new VideoRtpSender(local_stream_->GetVideoTracks()[0],
-                           {local_stream_->label()}, video_channel_);
+        new rtc::RefCountedObject<VideoRtpSender>(
+            local_stream_->GetVideoTracks()[0],
+            std::vector<std::string>({local_stream_->label()}), video_channel_);
     video_rtp_sender_->SetSsrc(kVideoSsrc);
     VerifyVideoChannelInput();
   }
@@ -164,14 +167,14 @@ class RtpSenderReceiverTest : public testing::Test,
   }
 
   void CreateAudioRtpReceiver() {
-    audio_rtp_receiver_ =
-        new AudioRtpReceiver(kAudioTrackId, kAudioSsrc, voice_channel_);
+    audio_rtp_receiver_ = new rtc::RefCountedObject<AudioRtpReceiver>(
+        kAudioTrackId, kAudioSsrc, voice_channel_);
     audio_track_ = audio_rtp_receiver_->audio_track();
     VerifyVoiceChannelOutput();
   }
 
   void CreateVideoRtpReceiver() {
-    video_rtp_receiver_ = new VideoRtpReceiver(
+    video_rtp_receiver_ = new rtc::RefCountedObject<VideoRtpReceiver>(
         kVideoTrackId, rtc::Thread::Current(), kVideoSsrc, video_channel_);
     video_track_ = video_rtp_receiver_->video_track();
     VerifyVideoChannelOutput();
@@ -409,7 +412,8 @@ TEST_F(RtpSenderReceiverTest, RemoteAudioTrackSetVolume) {
 // Test that the media channel isn't enabled for sending if the audio sender
 // doesn't have both a track and SSRC.
 TEST_F(RtpSenderReceiverTest, AudioSenderWithoutTrackAndSsrc) {
-  audio_rtp_sender_ = new AudioRtpSender(voice_channel_, nullptr);
+  audio_rtp_sender_ =
+      new rtc::RefCountedObject<AudioRtpSender>(voice_channel_, nullptr);
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
 
@@ -426,7 +430,7 @@ TEST_F(RtpSenderReceiverTest, AudioSenderWithoutTrackAndSsrc) {
 // Test that the media channel isn't enabled for sending if the video sender
 // doesn't have both a track and SSRC.
 TEST_F(RtpSenderReceiverTest, VideoSenderWithoutTrackAndSsrc) {
-  video_rtp_sender_ = new VideoRtpSender(video_channel_);
+  video_rtp_sender_ = new rtc::RefCountedObject<VideoRtpSender>(video_channel_);
 
   // Track but no SSRC.
   EXPECT_TRUE(video_rtp_sender_->SetTrack(video_track_));
@@ -441,7 +445,8 @@ TEST_F(RtpSenderReceiverTest, VideoSenderWithoutTrackAndSsrc) {
 // Test that the media channel is enabled for sending when the audio sender
 // has a track and SSRC, when the SSRC is set first.
 TEST_F(RtpSenderReceiverTest, AudioSenderEarlyWarmupSsrcThenTrack) {
-  audio_rtp_sender_ = new AudioRtpSender(voice_channel_, nullptr);
+  audio_rtp_sender_ =
+      new rtc::RefCountedObject<AudioRtpSender>(voice_channel_, nullptr);
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
   audio_rtp_sender_->SetSsrc(kAudioSsrc);
@@ -454,7 +459,8 @@ TEST_F(RtpSenderReceiverTest, AudioSenderEarlyWarmupSsrcThenTrack) {
 // Test that the media channel is enabled for sending when the audio sender
 // has a track and SSRC, when the SSRC is set last.
 TEST_F(RtpSenderReceiverTest, AudioSenderEarlyWarmupTrackThenSsrc) {
-  audio_rtp_sender_ = new AudioRtpSender(voice_channel_, nullptr);
+  audio_rtp_sender_ =
+      new rtc::RefCountedObject<AudioRtpSender>(voice_channel_, nullptr);
   rtc::scoped_refptr<AudioTrackInterface> track =
       AudioTrack::Create(kAudioTrackId, nullptr);
   audio_rtp_sender_->SetTrack(track);
@@ -468,7 +474,7 @@ TEST_F(RtpSenderReceiverTest, AudioSenderEarlyWarmupTrackThenSsrc) {
 // has a track and SSRC, when the SSRC is set first.
 TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupSsrcThenTrack) {
   AddVideoTrack();
-  video_rtp_sender_ = new VideoRtpSender(video_channel_);
+  video_rtp_sender_ = new rtc::RefCountedObject<VideoRtpSender>(video_channel_);
   video_rtp_sender_->SetSsrc(kVideoSsrc);
   video_rtp_sender_->SetTrack(video_track_);
   VerifyVideoChannelInput();
@@ -480,7 +486,7 @@ TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupSsrcThenTrack) {
 // has a track and SSRC, when the SSRC is set last.
 TEST_F(RtpSenderReceiverTest, VideoSenderEarlyWarmupTrackThenSsrc) {
   AddVideoTrack();
-  video_rtp_sender_ = new VideoRtpSender(video_channel_);
+  video_rtp_sender_ = new rtc::RefCountedObject<VideoRtpSender>(video_channel_);
   video_rtp_sender_->SetTrack(video_track_);
   video_rtp_sender_->SetSsrc(kVideoSsrc);
   VerifyVideoChannelInput();
@@ -711,8 +717,9 @@ TEST_F(RtpSenderReceiverTest,
   // applied even if the track is set on construction.
   video_track_->set_content_hint(VideoTrackInterface::ContentHint::kDetailed);
   video_rtp_sender_ =
-      new VideoRtpSender(local_stream_->GetVideoTracks()[0],
-                         {local_stream_->label()}, video_channel_);
+      new rtc::RefCountedObject<VideoRtpSender>(
+          local_stream_->GetVideoTracks()[0],
+          std::vector<std::string>({local_stream_->label()}), video_channel_);
   video_track_->set_enabled(true);
 
   // Sender is not ready to send (no SSRC) so no option should have been set.