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

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index df75245f276d039b7af827f3470eda152a0c4e18..d44fafe03c87dc118c802fa23918e63175e7800c 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -77,7 +77,7 @@ class BaseChannel
               const std::string& content_name,
               bool rtcp);
   virtual ~BaseChannel();
-  bool Init_w();
+  bool Init_w(const std::string* bundle_transport_name);
   // Deinit may be called multiple times and is simply ignored if it's already
   // done.
   void Deinit();
@@ -313,7 +313,7 @@ class BaseChannel
   }
 
  private:
-  bool InitNetwork_n();
+  bool InitNetwork_n(const std::string* bundle_transport_name);
   void DeinitNetwork_n();
   void SignalSentPacket_n(TransportChannel* channel,
                           const rtc::SentPacket& sent_packet);
@@ -372,7 +372,7 @@ class VoiceChannel : public BaseChannel {
                const std::string& content_name,
                bool rtcp);
   ~VoiceChannel();
-  bool Init_w();
+  bool Init_w(const std::string* bundle_transport_name);
 
   // Configure sending media on the stream with SSRC |ssrc|
   // If there is only one sending stream SSRC 0 can be used.
@@ -481,7 +481,7 @@ class VideoChannel : public BaseChannel {
                const std::string& content_name,
                bool rtcp);
   ~VideoChannel();
-  bool Init_w();
+  bool Init_w(const std::string* bundle_transport_name);
 
   // downcasts a MediaChannel
   VideoMediaChannel* media_channel() const override {
@@ -549,7 +549,7 @@ class DataChannel : public BaseChannel {
               const std::string& content_name,
               bool rtcp);
   ~DataChannel();
-  bool Init_w();
+  bool Init_w(const std::string* bundle_transport_name);
 
   virtual bool SendData(const SendDataParams& params,
                         const rtc::CopyOnWriteBuffer& payload,