Replace SetCapturer and SetCaptureDevice by SetSource.

webrtc/api/peerconnection.cc

Index: webrtc/api/peerconnection.cc
diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc
index b2b8062ca843a00015851e2f9a735d53e13fee0f..f92e9af4d6ac24ddd77597592d65c1b21f5e1488 100644
--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@@ -689,7 +689,7 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::AddTrack(
   rtc::scoped_refptr<RtpSenderInterface> new_sender;
   if (track->kind() == MediaStreamTrackInterface::kAudioKind) {
     new_sender = RtpSenderProxy::Create(
-        signaling_thread(),
+        signaling_thread(), nullptr,
         new AudioRtpSender(static_cast<AudioTrackInterface*>(track),
                            session_.get(), stats_.get()));
     if (!streams.empty()) {
@@ -702,7 +702,7 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::AddTrack(
     }
   } else if (track->kind() == MediaStreamTrackInterface::kVideoKind) {
     new_sender = RtpSenderProxy::Create(
-        signaling_thread(),
+        signaling_thread(), nullptr,
         new VideoRtpSender(static_cast<VideoTrackInterface*>(track),
                            session_.get()));
     if (!streams.empty()) {
@@ -759,7 +759,7 @@ rtc::scoped_refptr<DtmfSenderInterface> PeerConnection::CreateDtmfSender(
     LOG(LS_ERROR) << "CreateDtmfSender failed on DtmfSender::Create.";
     return NULL;
   }
-  return DtmfSenderProxy::Create(signaling_thread(), sender.get());
+  return DtmfSenderProxy::Create(signaling_thread(), nullptr, sender.get());
 }
 
 rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
@@ -769,9 +769,10 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
   rtc::scoped_refptr<RtpSenderInterface> new_sender;
   if (kind == MediaStreamTrackInterface::kAudioKind) {
     new_sender = RtpSenderProxy::Create(
-        signaling_thread(), new AudioRtpSender(session_.get(), stats_.get()));
+        signaling_thread(), nullptr,
+        new AudioRtpSender(session_.get(), stats_.get()));
   } else if (kind == MediaStreamTrackInterface::kVideoKind) {
-    new_sender = RtpSenderProxy::Create(signaling_thread(),
+    new_sender = RtpSenderProxy::Create(signaling_thread(), nullptr,
                                         new VideoRtpSender(session_.get()));
   } else {
     LOG(LS_ERROR) << "CreateSender called with invalid kind: " << kind;
@@ -851,7 +852,7 @@ PeerConnection::CreateDataChannel(
     observer_->OnRenegotiationNeeded();
   }
 
-  return DataChannelProxy::Create(signaling_thread(), channel.get());
+  return DataChannelProxy::Create(signaling_thread(), nullptr, channel.get());
 }
 
 void PeerConnection::CreateOffer(CreateSessionDescriptionObserver* observer,
@@ -1283,7 +1284,7 @@ void PeerConnection::CreateAudioReceiver(MediaStreamInterface* stream,
                                          const std::string& track_id,
                                          uint32_t ssrc) {
   receivers_.push_back(RtpReceiverProxy::Create(
-      signaling_thread(),
+      signaling_thread(), nullptr,
       new AudioRtpReceiver(stream, track_id, ssrc, session_.get())));
 }
 
@@ -1291,7 +1292,7 @@ void PeerConnection::CreateVideoReceiver(MediaStreamInterface* stream,
                                          const std::string& track_id,
                                          uint32_t ssrc) {
   receivers_.push_back(RtpReceiverProxy::Create(
-      signaling_thread(),
+      signaling_thread(), nullptr,
       new VideoRtpReceiver(stream, track_id, factory_->worker_thread(), ssrc,
                            session_.get())));
 }
@@ -1386,7 +1387,7 @@ void PeerConnection::OnAudioTrackAdded(AudioTrackInterface* track,
 
   // Normal case; we've never seen this track before.
   rtc::scoped_refptr<RtpSenderInterface> new_sender = RtpSenderProxy::Create(
-      signaling_thread(),
+      signaling_thread(), nullptr,
       new AudioRtpSender(track, stream->label(), session_.get(), stats_.get()));
   senders_.push_back(new_sender);
   // If the sender has already been configured in SDP, we call SetSsrc,
@@ -1428,7 +1429,7 @@ void PeerConnection::OnVideoTrackAdded(VideoTrackInterface* track,
 
   // Normal case; we've never seen this track before.
   rtc::scoped_refptr<RtpSenderInterface> new_sender = RtpSenderProxy::Create(
-      signaling_thread(),
+      signaling_thread(), nullptr,
       new VideoRtpSender(track, stream->label(), session_.get()));
   senders_.push_back(new_sender);
   const TrackInfo* track_info =
@@ -1599,7 +1600,7 @@ void PeerConnection::UpdateRemoteStreamsList(
         remote_streams_->find(stream_label);
     if (!stream) {
       // This is a new MediaStream. Create a new remote MediaStream.
-      stream = MediaStreamProxy::Create(rtc::Thread::Current(),
+      stream = MediaStreamProxy::Create(rtc::Thread::Current(), nullptr,
                                         MediaStream::Create(stream_label));
       remote_streams_->AddStream(stream);
       new_streams->AddStream(stream);
@@ -1620,7 +1621,8 @@ void PeerConnection::UpdateRemoteStreamsList(
     if (!default_stream) {
       // Create the new default MediaStream.
       default_stream = MediaStreamProxy::Create(
-          rtc::Thread::Current(), MediaStream::Create(kDefaultStreamLabel));
+          rtc::Thread::Current(), nullptr,
+          MediaStream::Create(kDefaultStreamLabel));
       remote_streams_->AddStream(default_stream);
       new_streams->AddStream(default_stream);
     }
@@ -1865,7 +1867,7 @@ void PeerConnection::CreateRemoteRtpDataChannel(const std::string& label,
   }
   channel->SetReceiveSsrc(remote_ssrc);
   observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+      DataChannelProxy::Create(signaling_thread(), nullptr, channel));
 }
 
 rtc::scoped_refptr<DataChannel> PeerConnection::InternalCreateDataChannel(
@@ -1996,7 +1998,7 @@ void PeerConnection::OnDataChannelOpenMessage(
   }
 
   observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+      DataChannelProxy::Create(signaling_thread(), nullptr, channel));
 }
 
 RtpSenderInterface* PeerConnection::FindSenderById(const std::string& id) {