Combining SetVideoSend and SetSource into one method.

webrtc/api/webrtcsession.cc

Index: webrtc/api/webrtcsession.cc
diff --git a/webrtc/api/webrtcsession.cc b/webrtc/api/webrtcsession.cc
index 19f5aa4128aea083feaf5c3065cde77a6e52c3d9..67d9c7d20cb5fa60d9adfd2c575524933282370a 100644
--- a/webrtc/api/webrtcsession.cc
+++ b/webrtc/api/webrtcsession.cc
@@ -1261,26 +1261,6 @@ bool WebRtcSession::SetAudioRtpParameters(uint32_t ssrc,
   return voice_channel_->SetRtpParameters(ssrc, parameters);
 }
 
-bool WebRtcSession::SetCaptureDevice(uint32_t ssrc,
-                                     cricket::VideoCapturer* camera) {
-  ASSERT(signaling_thread()->IsCurrent());
-
-  if (!video_channel_) {
-    // |video_channel_| doesnt't exist. Probably because the remote end doesnt't
-    // support video.
-    LOG(LS_WARNING) << "Video not used in this call.";
-    return false;
-  }
-  if (!video_channel_->SetCapturer(ssrc, camera)) {
-    // Allow that SetCapturer fail if |camera| is NULL but assert otherwise.
-    // This in the normal case when the underlying media channel has already
-    // been deleted.
-    ASSERT(camera == NULL);
-    return false;
-  }
-  return true;
-}
-
 void WebRtcSession::SetVideoPlayout(
     uint32_t ssrc,
     bool enable,
@@ -1300,17 +1280,18 @@ void WebRtcSession::SetVideoPlayout(
 
 void WebRtcSession::SetVideoSend(uint32_t ssrc,
                                  bool enable,
-                                 const cricket::VideoOptions* options) {
+                                 const cricket::VideoOptions* options,
+                                 cricket::VideoCapturer* camera) {
   ASSERT(signaling_thread()->IsCurrent());
   if (!video_channel_) {
     LOG(LS_WARNING) << "SetVideoSend: No video channel exists.";
     return;
   }
-  if (!video_channel_->SetVideoSend(ssrc, enable, options)) {
-    // Allow that MuteStream fail if |enable| is false but assert otherwise.
-    // This in the normal case when the underlying media channel has already
-    // been deleted.
-    ASSERT(enable == false);
+  if (!video_channel_->SetVideoSend(ssrc, enable, options, camera)) {
+    // Allow that MuteStream fail if |enable| is false and |camera| is NULL but
+    // assert otherwise. This in the normal case when the underlying media
+    // channel has already been deleted.
+    ASSERT(enable == false && camera == nullptr);
   }
 }