More minor improvements to BaseChannel/transport code.

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index c7749a97156e2165a18a22d8217d199b28d580b9..4c289a2345ea630afa4b55b96cd2b64d206f856c 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -107,8 +107,14 @@ class BaseChannel
 
   bool writable() const { return writable_; }
 
-  bool SetTransport(TransportChannel* rtp_transport,
-                    TransportChannel* rtcp_transport);
+  // Set the transport(s), and update writability and "ready-to-send" state.
+  // |rtp_transport| must be non-null.
+  // |rtcp_transport| must be supplied if NeedsRtcpTransport() is true (meaning
+  // RTCP muxing is not fully active yet).
+  // |rtp_transport| and |rtcp_transport| must share the same transport name as
+  // well.
+  void SetTransports(TransportChannel* rtp_transport,
+                     TransportChannel* rtcp_transport);
   bool PushdownLocalDescription(const SessionDescription* local_desc,
                                 ContentAction action,
                                 std::string* error_desc);
@@ -194,11 +200,8 @@ class BaseChannel
  protected:
   virtual MediaChannel* media_channel() const { return media_channel_; }
 
-  // Sets the |rtp_transport_| (and |rtcp_transport_|, if
-  // |rtcp_enabled_| is true).
-  // This method also updates writability and "ready-to-send" state.
-  bool SetTransport_n(TransportChannel* rtp_transport,
-                      TransportChannel* rtcp_transport);
+  void SetTransports_n(TransportChannel* rtp_transport,
+                       TransportChannel* rtcp_transport);
 
   // This does not update writability or "ready-to-send" state; it just
   // disconnects from the old channel and connects to the new one.