Media Remoting: Add feature to control enabling Media Remoting.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2755 matching lines @@
       RenderThreadImpl::current()->SharedMainThreadContextProvider());
 
   scoped_refptr<media::MediaLog> media_log(
       new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL()));
 
 #if defined(OS_ANDROID)
   if (UseWebMediaPlayerImpl(url) && !media_surface_manager_)
     media_surface_manager_ = new RendererSurfaceViewManager(this);
 #endif  // defined(OS_ANDROID)
 
+  base::WeakPtr<media::MediaObserver> media_observer = nullptr;

[xhwang, 2016/11/02 05:18:39]

"= nullptr" not necessary

[xjz, 2016/11/02 17:48:05]

Done.

 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-  std::unique_ptr<media::RemotingController> remoting_controller =
-      CreateRemotingController();
-  base::WeakPtr<media::MediaObserver> media_observer =
-      remoting_controller->GetWeakPtr();
-#else
-  base::WeakPtr<media::MediaObserver> media_observer = nullptr;
+  std::unique_ptr<media::RemotingController> remoting_controller = nullptr;

[xhwang, 2016/11/02 05:18:38]

"= nullptr" not necessary

[xjz, 2016/11/02 17:48:05]

Done.

+  if (base::FeatureList::IsEnabled(media::kMediaRemoting)) {
+    remoting_controller = CreateRemotingController();
+    media_observer = remoting_controller->GetWeakPtr();
+  }
 #endif
 
   media::WebMediaPlayerParams params(
       base::Bind(&ContentRendererClient::DeferMediaLoad,
                  base::Unretained(GetContentClient()->renderer()),
                  static_cast<RenderFrame*>(this),
                  GetWebMediaPlayerDelegate()->has_played_media()),
       audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
       render_thread->GetWorkerTaskRunner(),
       render_thread->compositor_task_runner(), context_3d_cb,
@@ skipping 34 matching lines @@
 #else
     media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
         media_log, GetDecoderFactory(),
         base::Bind(&RenderThreadImpl::GetGpuFactories,
                    base::Unretained(render_thread)));
 #endif
   }
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   media::RemotingController* remoting_controller_ptr =
-      remoting_controller.get();
-  media_renderer_factory = base::MakeUnique<media::RemotingRendererFactory>(
-      std::move(media_renderer_factory), std::move(remoting_controller));
+      remoting_controller ? remoting_controller.get() : nullptr;

[xhwang, 2016/11/02 05:18:38]

This change seems unnecessary; it doesn't change anything...

[xjz, 2016/11/02 17:48:05]

Done.

+  if (remoting_controller) {
+    media_renderer_factory = base::MakeUnique<media::RemotingRendererFactory>(
+        std::move(media_renderer_factory), std::move(remoting_controller));
+  }
 #endif
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client,
       GetWebMediaPlayerDelegate()->AsWeakPtr(),
       std::move(media_renderer_factory), url_index_, params);
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   media_player->SetMediaPlayerManager(GetMediaPlayerManager());
   media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
   media_player->SetUseFallbackPath(use_fallback_path);
 #endif  // defined(OS_ANDROID)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-  remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
-      &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
+  if (remoting_controller_ptr) {
+    remoting_controller_ptr->SetSwitchRendererCallback(
+        base::Bind(&media::WebMediaPlayerImpl::ScheduleRestart,
+                   media_player->AsWeakPtr()));
+  }
 #endif
   return media_player;
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
     blink::WebApplicationCacheHostClient* client) {
   if (!frame_ || !frame_->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
       RenderViewImpl::FromWebView(frame_->view()), client,
@@ skipping 3759 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content