Revert of Refactoring of RTCP options in BaseChannel.

webrtc/pc/channelmanager.h

Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 2ee72270803e6d9bdfd9eeaf626e837632f0435a..89af44afeea59a6a7d0503a53e03997884ebf7b9 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -95,7 +95,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required,
       const AudioOptions& options);
   // Destroys a voice channel created with the Create API.
@@ -109,7 +109,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required,
       const VideoOptions& options);
   // Destroys a video channel created with the Create API.
@@ -121,7 +121,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required);
   // Destroys a data channel created with the Create API.
   void DestroyRtpDataChannel(RtpDataChannel* data_channel);
@@ -172,7 +172,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required,
       const AudioOptions& options);
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
@@ -183,7 +183,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
@@ -194,7 +194,7 @@
       rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
-      bool rtcp_mux_required,
+      bool rtcp,
       bool srtp_required);
   void DestroyRtpDataChannel_w(RtpDataChannel* data_channel);