Fix build when webrtc is disabled; i.e. when enable_webrtc is set to 0 in build/common.gypi.

Building with webrtc disabled is currently not tested by any build bots. Landing the support for PeerConnection v2 (instead of v1) in 119568 broke the build when webrtc is disabled.

The stub implementations must be updated to reflect the new interfaces.

TEST=Set enable_webrtc to 0 in build/common.gypi; build chrome.

Review URL: https://chromiumcodereview.appspot.com/9302030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119888 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 34 insertions, 32 deletions

diff --git a/content/renderer/media/media_stream_dependency_factory_stub.cc b/content/renderer/media/media_stream_dependency_factory_stub.cc
index 6cd5afd..82adb97 100644
--- a/content/renderer/media/media_stream_dependency_factory_stub.cc
+++ b/content/renderer/media/media_stream_dependency_factory_stub.cc
@@ -8,34 +8,44 @@ MediaStreamDependencyFactory::MediaStreamDependencyFactory() {}
 
 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {}
 
-cricket::WebRtcMediaEngine*
-MediaStreamDependencyFactory::CreateWebRtcMediaEngine() {
-  return NULL;
-}
-
 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory(
-    cricket::MediaEngineInterface* media_engine,
-    talk_base::Thread* worker_thread) {
+    talk_base::Thread* worker_thread,
+    talk_base::Thread* signaling_thread,
+    content::P2PSocketDispatcher* socket_dispatcher,
+    talk_base::NetworkManager* network_manager,
+    talk_base::PacketSocketFactory* socket_factory) {
   return false;
 }
 
-void MediaStreamDependencyFactory::DeletePeerConnectionFactory() {
+void MediaStreamDependencyFactory::ReleasePeerConnectionFactory() {
 }
 
 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
   return false;
 }
 
-cricket::PortAllocator* MediaStreamDependencyFactory::CreatePortAllocator(
-    content::P2PSocketDispatcher* socket_dispatcher,
-    talk_base::NetworkManager* network_manager,
-    talk_base::PacketSocketFactory* socket_factory,
-    const webkit_glue::P2PTransport::Config& config) {
+talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
+MediaStreamDependencyFactory::CreatePeerConnection(
+    const std::string& config,
+    webrtc::PeerConnectionObserver* observer) {
+  return NULL;
+}
+
+talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
+MediaStreamDependencyFactory::CreateLocalMediaStream(const std::string& label) {
+  return NULL;
+}
+
+talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
+MediaStreamDependencyFactory::CreateLocalVideoTrack(
+    const std::string& label,
+    cricket::VideoCapturer* video_device) {
   return NULL;
 }
 
-webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection(
-    cricket::PortAllocator* port_allocator,
-    talk_base::Thread* signaling_thread) {
+talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
+MediaStreamDependencyFactory::CreateLocalAudioTrack(
+    const std::string& label,
+    webrtc::AudioDeviceModule* audio_device) {
   return NULL;
 }
diff --git a/content/renderer/media/media_stream_impl_stub.cc b/content/renderer/media/media_stream_impl_stub.cc
index cb67bce..ade3fee 100644
--- a/content/renderer/media/media_stream_impl_stub.cc
+++ b/content/renderer/media/media_stream_impl_stub.cc
@@ -16,7 +16,6 @@ MediaStreamImpl::MediaStreamImpl(
     MediaStreamDependencyFactory* dependency_factory)
     : dependency_factory_(dependency_factory),
       media_stream_dispatcher_(media_stream_dispatcher),
-      media_engine_(NULL),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       network_manager_(NULL),
       vc_manager_(vc_manager),
@@ -24,15 +23,10 @@ MediaStreamImpl::MediaStreamImpl(
       message_loop_proxy_(base::MessageLoopProxy::current()),
       signaling_thread_(NULL),
       worker_thread_(NULL),
-      chrome_worker_thread_("Chrome_libJingle_WorkerThread"),
-      vcm_created_(false) {
+      chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
 }
 
-MediaStreamImpl::~MediaStreamImpl() {
-  DCHECK(!peer_connection_handler_);
-  if (dependency_factory_.get())
-    dependency_factory_->DeletePeerConnectionFactory();
-}
+MediaStreamImpl::~MediaStreamImpl() {}
 
 WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler(
     WebKit::WebPeerConnectionHandlerClient* client) {
@@ -42,8 +36,9 @@ WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler(
 void MediaStreamImpl::ClosePeerConnection() {
 }
 
-bool MediaStreamImpl::SetVideoCaptureModule(const std::string& label) {
-  return false;
+webrtc::MediaStreamTrackInterface* MediaStreamImpl::GetLocalMediaStreamTrack(
+    const std::string& label) {
+  return NULL;
 }
 
 void MediaStreamImpl::requestUserMedia(
@@ -69,8 +64,7 @@ void MediaStreamImpl::OnStreamGenerated(
     const media_stream::StreamDeviceInfoArray& video_array) {
 }
 
-void MediaStreamImpl::OnStreamGenerationFailed(int request_id) {
-}
+void MediaStreamImpl::OnStreamGenerationFailed(int request_id) {}
 
 void MediaStreamImpl::OnVideoDeviceFailed(const std::string& label,
                                           int index) {
@@ -85,8 +79,7 @@ void MediaStreamImpl::OnDevicesEnumerated(
     const media_stream::StreamDeviceInfoArray& device_array) {
 }
 
-void MediaStreamImpl::OnDevicesEnumerationFailed(int request_id) {
-}
+void MediaStreamImpl::OnDevicesEnumerationFailed(int request_id) {}
 
 void MediaStreamImpl::OnDeviceOpened(
     int request_id,
@@ -94,5 +87,4 @@ void MediaStreamImpl::OnDeviceOpened(
     const media_stream::StreamDeviceInfo& video_device) {
 }
 
-void MediaStreamImpl::OnDeviceOpenFailed(int request_id) {
-}
+void MediaStreamImpl::OnDeviceOpenFailed(int request_id) {}