[chromecast] Pass media task runner to VideoPlaneController.

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 13 matching lines @@
 #include "chromecast/browser/cast_browser_process.h"
 #include "chromecast/browser/cast_network_delegate.h"
 #include "chromecast/browser/cast_quota_permission_context.h"
 #include "chromecast/browser/cast_resource_dispatcher_host_delegate.h"
 #include "chromecast/browser/geolocation/cast_access_token_store.h"
 #include "chromecast/browser/media/cma_media_pipeline_client.h"
 #include "chromecast/browser/media/cma_message_filter_host.h"
 #include "chromecast/browser/service/cast_service_simple.h"
 #include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/common/global_descriptors.h"
-#include "chromecast/media/base/media_message_loop.h"
-#include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "components/network_hints/browser/network_hints_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 28 matching lines @@
   scoped_ptr<::media::MojoMediaClient> mojo_media_client(
       new media::CastMojoMediaClient(
           browser_client->GetCmaMediaPipelineClient()));
   return scoped_ptr<mojo::ShellClient>(
       new ::media::MojoMediaApplication(std::move(mojo_media_client)));
 }
 #endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
 }  // namespace
 
 CastContentBrowserClient::CastContentBrowserClient()
-    : url_request_context_factory_(new URLRequestContextFactory()) {
-}
+    : cast_browser_main_parts_(nullptr),
+      url_request_context_factory_(new URLRequestContextFactory()) {}
 
 CastContentBrowserClient::~CastContentBrowserClient() {
   content::BrowserThread::DeleteSoon(
       content::BrowserThread::IO,
       FROM_HERE,
       url_request_context_factory_.release());
 }
 
 void CastContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line) {
 }
 
 void CastContentBrowserClient::PreCreateThreads() {
 }
 
 scoped_ptr<CastService> CastContentBrowserClient::CreateCastService(
     content::BrowserContext* browser_context,
     PrefService* pref_service,
-    net::URLRequestContextGetter* request_context_getter) {
+    net::URLRequestContextGetter* request_context_getter,
+    media::VideoPlaneController* video_plane_controller) {
   return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service));
 }
 
 #if !defined(OS_ANDROID)
 scoped_refptr<media::CmaMediaPipelineClient>
 CastContentBrowserClient::GetCmaMediaPipelineClient() {
   if (!cma_media_pipeline_client_.get())
     cma_media_pipeline_client_ = CreateCmaMediaPipelineClient();
   return cma_media_pipeline_client_;
 }
 #endif  // OS_ANDROID
 
-void CastContentBrowserClient::ProcessExiting() {
-  // Finalize CastMediaShlib on media thread to ensure it's not accessed
-  // after Finalize.
-  GetMediaTaskRunner()->PostTask(FROM_HERE,
-                                 base::Bind(&media::CastMediaShlib::Finalize));
-}
-
 void CastContentBrowserClient::SetMetricsClientId(
     const std::string& client_id) {
 }
 
 void CastContentBrowserClient::RegisterMetricsProviders(
     ::metrics::MetricsService* metrics_service) {
 }
 
 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() {
   return true;
 }
 
 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
-  content::BrowserMainParts* parts =
+  DCHECK(!cast_browser_main_parts_);
+  cast_browser_main_parts_ =
       new CastBrowserMainParts(parameters, url_request_context_factory_.get());
   CastBrowserProcess::GetInstance()->SetCastContentBrowserClient(this);
-  return parts;
+  return cast_browser_main_parts_;
 }
 
 void CastContentBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
 #if !defined(OS_ANDROID)
   scoped_refptr<media::CmaMessageFilterHost> cma_message_filter(
       new media::CmaMessageFilterHost(
           host->GetID(), GetCmaMediaPipelineClient(), GetMediaTaskRunner()));
   host->AddFilter(cma_message_filter.get());
 #endif  // !defined(OS_ANDROID)
 
   // Forcibly trigger I/O-thread URLRequestContext initialization before
   // getting HostResolver.
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&net::URLRequestContextGetter::GetURLRequestContext,
                  base::Unretained(
                     url_request_context_factory_->GetSystemGetter())),
       base::Bind(&CastContentBrowserClient::AddNetworkHintsMessageFilter,
                  base::Unretained(this), host->GetID()));
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 CastContentBrowserClient::GetMediaTaskRunner() {
-  // TODO(alokp): Obtain task runner from a local thread or mojo media app.
-  return media::MediaMessageLoop::GetTaskRunner();
+  DCHECK(cast_browser_main_parts_);
+  return cast_browser_main_parts_->GetMediaTaskRunner();
 }
 
 #if !defined(OS_ANDROID)
 scoped_refptr<media::CmaMediaPipelineClient>
 CastContentBrowserClient::CreateCmaMediaPipelineClient() {
   return make_scoped_refptr(new media::CmaMediaPipelineClient());
 }
 #endif  // OS_ANDROID
 
 void CastContentBrowserClient::AddNetworkHintsMessageFilter(
@@ skipping 318 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast