disable media stream creation when enable_webrtc=0

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 486 matching lines @@
 
   OnSetRendererPrefs(renderer_prefs);
 
   host_window_ = parent_hwnd;
 
 #if defined(ENABLE_P2P_APIS)
   if (!p2p_socket_dispatcher_)
     p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
   if (!media_stream_dispatcher_)

[Satish, 2012/02/09 13:09:55]

Also need to wrap these two lines in #if defined(ENABLE_WEBRTC)

[wjia(left Chromium), 2012/02/09 18:20:52]

Done.

     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
   devtools_agent_ = new DevToolsAgent(this);
@@ skipping 97 matching lines @@
       frame_name,
       next_page_id);  // adds reference
 }
 
 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
     WebKit::WebPeerConnectionHandlerClient* client) {
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
     return NULL;
   EnsureMediaStreamImpl();
+  if (!media_stream_impl_.get())
+    return NULL;
   return media_stream_impl_->CreatePeerConnectionHandler(client);
 }
 
 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
   observer->RenderViewGone();
   observers_.RemoveObserver(observer);
@@ skipping 2504 matching lines @@
   Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_,
                                                       preferred_size_));
 }
 
 void RenderViewImpl::EnsureMediaStreamImpl() {
 #if defined(ENABLE_P2P_APIS)
   if (!p2p_socket_dispatcher_)
     p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
+#if defined(ENABLE_WEBRTC)
   if (!media_stream_dispatcher_)
     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 
   if (!media_stream_impl_.get()) {
     MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory();
     media_stream_impl_ = new MediaStreamImpl(
         media_stream_dispatcher_,
         p2p_socket_dispatcher_,
         RenderThreadImpl::current()->video_capture_impl_manager(),
         factory);
   }
+#endif
 }
 
 void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
                                            const WebSize& size) {
   if (webview()->mainFrame() != frame)
     return;
   WebView* frameView = frame->view();
   if (!frameView)
     return;
 
@@ skipping 1858 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
 #endif
 }