Implement and use VideoTrackSource directly.

content/renderer/media/webrtc/peer_connection_dependency_factory.h

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.h
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index 0486380138657892eb93510be53064cc23b99760..4f52425d31884f1a2e36bd01a95e0e98cd4faafc 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -50,7 +50,6 @@ class IpcPacketSocketFactory;
 class WebRtcAudioDeviceImpl;
 class WebRtcLoggingHandlerImpl;
 class WebRtcLoggingMessageFilter;
-class WebRtcVideoCapturerAdapter;
 struct StreamDeviceInfo;
 
 // Object factory for RTC PeerConnections.
@@ -67,25 +66,20 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   blink::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client);
 
+  // Create a proxy object for a VideoTrackSource that makes sure it's called on
+  // the correct threads.
+  virtual scoped_refptr<webrtc::VideoTrackSourceInterface>
+  CreateVideoTrackSourceProxy(webrtc::VideoTrackSourceInterface* source);
+
   // Asks the PeerConnection factory to create a Local MediaStream object.
   virtual scoped_refptr<webrtc::MediaStreamInterface>
       CreateLocalMediaStream(const std::string& label);
 
-  // Creates an implementation of a cricket::VideoCapturer object that can be
-  // used when creating a libjingle webrtc::VideoTrackSourceInterface object.
-  virtual WebRtcVideoCapturerAdapter* CreateVideoCapturer(
-      bool is_screen_capture);
-
   // Asks the PeerConnection factory to create a Local VideoTrack object.
   virtual scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack(
       const std::string& id,
       webrtc::VideoTrackSourceInterface* source);
 
-  // Asks the PeerConnection factory to create a Video Source.
-  // The video source takes ownership of |capturer|.
-  virtual scoped_refptr<webrtc::VideoTrackSourceInterface> CreateVideoSource(
-      cricket::VideoCapturer* capturer);
-
   // Asks the libjingle PeerConnection factory to create a libjingle
   // PeerConnection object.
   // The PeerConnection object is owned by PeerConnectionHandler.
@@ -116,12 +110,6 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
       const;
 
  protected:
-  // Asks the PeerConnection factory to create a Local VideoTrack object with
-  // the video source using |capturer|.
-  virtual scoped_refptr<webrtc::VideoTrackInterface>
-      CreateLocalVideoTrack(const std::string& id,
-                            cricket::VideoCapturer* capturer);
-
   virtual const scoped_refptr<webrtc::PeerConnectionFactoryInterface>&
       GetPcFactory();
   virtual bool PeerConnectionFactoryCreated();