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

webrtc/pc/channelmanager.h

Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 72a2f056b5a4c0b6bb797f1a5792f575bb8a9ee3..9ab739a59ec189102cdf9a8bc4e669b9f5792817 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -80,6 +80,7 @@ class ChannelManager {
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
+      const std::string& transport_name,
       bool rtcp,
       const AudioOptions& options);
   // Destroys a voice channel created with the Create API.
@@ -90,12 +91,14 @@ class ChannelManager {
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
+      const std::string& transport_name,
       bool rtcp,
       const VideoOptions& options);
   // Destroys a video channel created with the Create API.
   void DestroyVideoChannel(VideoChannel* video_channel);
   DataChannel* CreateDataChannel(TransportController* transport_controller,
                                  const std::string& content_name,
+                                 const std::string& transport_name,
                                  bool rtcp,
                                  DataChannelType data_channel_type);
   // Destroys a data channel created with the Create API.
@@ -146,6 +149,7 @@ class ChannelManager {
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
+      const std::string& transport_name,
       bool rtcp,
       const AudioOptions& options);
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
@@ -153,11 +157,13 @@ class ChannelManager {
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
+      const std::string& transport_name,
       bool rtcp,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(TransportController* transport_controller,
                                    const std::string& content_name,
+                                   const std::string& transport_name,
                                    bool rtcp,
                                    DataChannelType data_channel_type);
   void DestroyDataChannel_w(DataChannel* data_channel);