Delete default_send_ssrc_.

webrtc/media/base/videoengine_unittest.h

Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index f44e63ac1c2248ed97ab824c870a5774406fe473..01df10684738d286413ecbcf014bf180d39565ac 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -1143,6 +1143,8 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_EQ(1, renderer2_.num_rendered_frames());
   }
 
+  // TODO(nisse): Delete test? "default channel" concept is now gone.

[pthatcher1, 2016/03/18 16:55:48]

This test is not just verifying that we can add and remove streams, which I
believe is covered by other tests.  So, yes, please delete it.

By the way, there is now no longer any reason to have this be a separate file
from webrtcvideoengine2_unittest.cc.  If you feel inclined, please merge the two
and delete this file.

[nisse-webrtc, 2016/03/21 07:53:53]

Done.

+
   // Set up 2 streams where the first stream uses the default channel.
   // Then disconnect the first stream and verify default channel becomes
   // available.
@@ -1150,19 +1152,13 @@ class VideoMediaChannelTest : public testing::Test,
   // default channel.
   void TwoStreamsReUseFirstStream(const cricket::VideoCodec& codec) {
     SetUpSecondStream();
-    // Default channel used by the first stream.
-    EXPECT_EQ(kSsrc, channel_->GetDefaultSendChannelSsrc());
     EXPECT_TRUE(channel_->RemoveRecvStream(kSsrc));
     EXPECT_FALSE(channel_->RemoveRecvStream(kSsrc));
     EXPECT_TRUE(channel_->RemoveSendStream(kSsrc));
     EXPECT_FALSE(channel_->RemoveSendStream(kSsrc));
-    // Default channel is no longer used by a stream.
-    EXPECT_EQ(0u, channel_->GetDefaultSendChannelSsrc());
     uint32_t new_ssrc = kSsrc + 100;
     EXPECT_TRUE(channel_->AddSendStream(
         cricket::StreamParams::CreateLegacy(new_ssrc)));
-    // Re-use default channel.
-    EXPECT_EQ(new_ssrc, channel_->GetDefaultSendChannelSsrc());
     EXPECT_FALSE(channel_->AddSendStream(
         cricket::StreamParams::CreateLegacy(new_ssrc)));
     EXPECT_TRUE(channel_->AddRecvStream(
@@ -1175,7 +1171,6 @@ class VideoMediaChannelTest : public testing::Test,
 
     SendAndReceive(codec);
     EXPECT_TRUE(channel_->RemoveSendStream(new_ssrc));
-    EXPECT_EQ(0u, channel_->GetDefaultSendChannelSsrc());
   }
 
   const std::unique_ptr<webrtc::Call> call_;