[chromecast] Bind and run mojo media services on cma thread.

chromecast/browser/cast_content_browser_client.cc

Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index dc5902ac7e67d80b42745ebef9874ac48bb4bbe7..4f0d3d9bb6265b7ac3e8512eb3f1165c1e36946f 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -50,9 +50,8 @@
 #include "ui/gl/gl_switches.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+#include "chromecast/browser/media/cast_mojo_media_application.h"
 #include "chromecast/browser/media/cast_mojo_media_client.h"
-// nogncheck because of conditional dependency.
-#include "media/mojo/services/mojo_media_application.h"  // nogncheck
 #endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
 
 #if defined(OS_ANDROID)
@@ -69,12 +68,12 @@ namespace {
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 static scoped_ptr<mojo::ShellClient> CreateCastMojoMediaApplication(
     CastContentBrowserClient* browser_client) {
-  scoped_ptr<::media::MojoMediaClient> mojo_media_client(
+  scoped_ptr<media::CastMojoMediaClient> mojo_media_client(
       new media::CastMojoMediaClient(
           base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend,
                      base::Unretained(browser_client))));
-  return scoped_ptr<mojo::ShellClient>(
-      new ::media::MojoMediaApplication(std::move(mojo_media_client)));
+  return scoped_ptr<mojo::ShellClient>(new media::CastMojoMediaApplication(
+      std::move(mojo_media_client), browser_client->GetMediaTaskRunner()));
 }
 #endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
 }  // namespace
@@ -106,6 +105,12 @@ scoped_ptr<CastService> CastContentBrowserClient::CreateCastService(
 }
 
 #if !defined(OS_ANDROID)
+scoped_refptr<base::SingleThreadTaskRunner>
+CastContentBrowserClient::GetMediaTaskRunner() {
+  DCHECK(cast_browser_main_parts_);
+  return cast_browser_main_parts_->GetMediaTaskRunner();
+}
+
 scoped_ptr<media::MediaPipelineBackend>
 CastContentBrowserClient::CreateMediaPipelineBackend(
     const media::MediaPipelineDeviceParams& params) {
@@ -163,12 +168,6 @@ void CastContentBrowserClient::RenderProcessWillLaunch(
                  base::Unretained(this), host->GetID()));
 }
 
-scoped_refptr<base::SingleThreadTaskRunner>
-CastContentBrowserClient::GetMediaTaskRunner() {
-  DCHECK(cast_browser_main_parts_);
-  return cast_browser_main_parts_->GetMediaTaskRunner();
-}
-
 void CastContentBrowserClient::AddNetworkHintsMessageFilter(
     int render_process_id, net::URLRequestContext* context) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);