Combining SetVideoSend and SetSource into one method.

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index df75245f276d039b7af827f3470eda152a0c4e18..c158cc4b7b78ebb7113d1d977e45d9d373d0eb3a 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -489,8 +489,6 @@ class VideoChannel : public BaseChannel {
   }
 
   bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink);
-  // Register a source. The |ssrc| must correspond to a registered
-  // send stream.
   void SetSource(uint32_t ssrc,
                  rtc::VideoSourceInterface<cricket::VideoFrame>* source);
   // Get statistics about the current media session.
@@ -503,7 +501,12 @@ class VideoChannel : public BaseChannel {
   void StopMediaMonitor();
   sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
 
-  bool SetVideoSend(uint32_t ssrc, bool enable, const VideoOptions* options);
+  // Register a source and set options.
+  // The |ssrc| must correspond to a registered send stream.
+  bool SetVideoSend(uint32_t ssrc,
+                    bool enable,
+                    const VideoOptions* options,
+                    rtc::VideoSourceInterface<cricket::VideoFrame>* source);
   webrtc::RtpParameters GetRtpParameters(uint32_t ssrc) const;
   bool SetRtpParameters(uint32_t ssrc, const webrtc::RtpParameters& parameters);