Respect disable_webrtc command line.

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 "base/auto_reset.h"
@@ skipping 3050 matching lines @@
     return;
   webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
 }
 
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
-
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 #if defined(ENABLE_WEBRTC)
-  if (!InitializeMediaStreamClient())
-    return NULL;
-
+  bool webrtc_enabled = !cmd_line->HasSwitch(switches::kDisableWebRTC);
+  if (webrtc_enabled) {

[jamesr, 2013/10/30 22:45:20]

early return would be better

if (cmd_line->HasSwitch(switches::kDisableWebRTC))
  return;

[michaelbai, 2013/10/30 22:48:35]

We can't return and still want to create WebMediaPlayerAndroid in line 3136 when
WebRTC disabled, 

On 2013/10/30 22:45:20, jamesr wrote:

[jamesr, 2013/10/30 22:50:11]

This function's way too complicated. Break it up into pieces that do one thing
each.

[michaelbai, 2013/10/30 23:13:30]

Agreed, I had another CL https://codereview.chromium.org/52463004/ depends on
this, how about getting this landed, then I will refactoring this code.


On 2013/10/30 22:50:11, jamesr wrote:

+    if (!InitializeMediaStreamClient()) {
+      LOG(ERROR) << "Failed to initialize MediaStreamClient";
+      return NULL;
+    }
 #if !defined(GOOGLE_TV)
-  if (media_stream_client_->IsMediaStream(url)) {
+    if (media_stream_client_->IsMediaStream(url)) {
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
-    bool found_neon =
-        (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-    UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
+      bool found_neon =
+          (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
+      UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
 #endif  // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
-    return new WebMediaPlayerMS(
-        frame, client, AsWeakPtr(), media_stream_client_, new RenderMediaLog());
+      return new WebMediaPlayerMS(frame, client, AsWeakPtr(),
+                                  media_stream_client_, new RenderMediaLog());
+    }
+#endif  // !defined(GOOGLE_TV)
   }
-#endif  // !defined(GOOGLE_TV)
 #endif  // defined(ENABLE_WEBRTC)
 
 #if defined(OS_ANDROID)
   GpuChannelHost* gpu_channel_host =
       RenderThreadImpl::current()->EstablishGpuChannelSync(
           CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
   if (!gpu_channel_host) {
     LOG(ERROR) << "Failed to establish GPU channel for media player";
     return NULL;
   }
@@ skipping 25 matching lines @@
       new WebMediaPlayerAndroid(
           frame,
           client,
           AsWeakPtr(),
           media_player_manager_.get(),
           media_player_proxy_,
           stream_texture_factory.release(),
           RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
           new RenderMediaLog()));
 #if defined(ENABLE_WEBRTC) && defined(GOOGLE_TV)
-  if (media_stream_client_->IsMediaStream(url)) {
+  if (webrtc_enabled && media_stream_client_->IsMediaStream(url)) {
     RTCVideoDecoderFactoryTv* factory = RenderThreadImpl::current()
         ->GetMediaStreamDependencyFactory()->decoder_factory_tv();
     // |media_stream_client| and |factory| outlives |web_media_player_android|.
     if (!factory->AcquireDemuxer() ||
         !web_media_player_android->InjectMediaStream(
             media_stream_client_,
             factory,
             base::Bind(
                 base::IgnoreResult(&RTCVideoDecoderFactoryTv::ReleaseDemuxer),
                 base::Unretained(factory)))) {
@@ skipping 3445 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content