Do not create a temporary transport channel when using max-bundle

webrtc/pc/channelmanager_unittest.cc

Index: webrtc/pc/channelmanager_unittest.cc
diff --git a/webrtc/pc/channelmanager_unittest.cc b/webrtc/pc/channelmanager_unittest.cc
index 8cb066b25df3eb61db5c6b3cf03745863017e7d1..bf735e292ca042d4e32526ff9138eac9ec32c7fa 100644
--- a/webrtc/pc/channelmanager_unittest.cc
+++ b/webrtc/pc/channelmanager_unittest.cc
@@ -93,16 +93,17 @@ TEST_F(ChannelManagerTest, StartupShutdownOnThread) {
 // Test that we can create and destroy a voice and video channel.
 TEST_F(ChannelManagerTest, CreateDestroyChannels) {
   EXPECT_TRUE(cm_->Init());
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, cricket::CN_AUDIO,
+      false, AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, cricket::CN_VIDEO,
+      false, VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
-  cricket::DataChannel* data_channel = cm_->CreateDataChannel(
-      transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
+  cricket::DataChannel* data_channel =
+      cm_->CreateDataChannel(transport_controller_, cricket::CN_DATA,
+                             cricket::CN_DATA, false, cricket::DCT_RTP);
   EXPECT_TRUE(data_channel != nullptr);
   cm_->DestroyVideoChannel(video_channel);
   cm_->DestroyVoiceChannel(voice_channel);
@@ -118,16 +119,17 @@ TEST_F(ChannelManagerTest, CreateDestroyChannelsOnThread) {
   delete transport_controller_;
   transport_controller_ =
       new cricket::FakeTransportController(&worker_, ICEROLE_CONTROLLING);
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, cricket::CN_AUDIO,
+      false, AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, cricket::CN_VIDEO,
+      false, VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
-  cricket::DataChannel* data_channel = cm_->CreateDataChannel(
-      transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
+  cricket::DataChannel* data_channel =
+      cm_->CreateDataChannel(transport_controller_, cricket::CN_DATA,
+                             cricket::CN_DATA, false, cricket::DCT_RTP);
   EXPECT_TRUE(data_channel != nullptr);
   cm_->DestroyVideoChannel(video_channel);
   cm_->DestroyVoiceChannel(voice_channel);
@@ -145,16 +147,17 @@ TEST_F(ChannelManagerTest, NoTransportChannelTest) {
   ASSERT_TRUE(transport_controller_->CreateTransportChannel_w(
                   "audio", cricket::ICE_CANDIDATE_COMPONENT_RTP) == nullptr);
 
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, cricket::CN_AUDIO,
+      false, AudioOptions());
   EXPECT_TRUE(voice_channel == nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, cricket::CN_VIDEO,
+      false, VideoOptions());
   EXPECT_TRUE(video_channel == nullptr);
-  cricket::DataChannel* data_channel = cm_->CreateDataChannel(
-      transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
+  cricket::DataChannel* data_channel =
+      cm_->CreateDataChannel(transport_controller_, cricket::CN_DATA,
+                             cricket::CN_DATA, false, cricket::DCT_RTP);
   EXPECT_TRUE(data_channel == nullptr);
   cm_->Terminate();
 }