Reland of land "media: Refactor MojoMediaClient" with fix.

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 aea55a6cf487074dcf5634b9d80ef96b953a42b2..12a47548871a9d49e28c16272fa9c4dab7e8ee7d 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -52,6 +52,7 @@
 #include "ui/gl/gl_switches.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+#include "chromecast/media/mojo/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
@@ -357,9 +358,10 @@
 void CastContentBrowserClient::RegisterInProcessMojoApplications(
     StaticMojoApplicationMap* apps) {
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-  apps->insert(
-      std::make_pair(GURL("mojo:media"),
-                     base::Bind(::media::MojoMediaApplication::CreateApp)));
+  apps->insert(std::make_pair(
+      GURL("mojo:media"),
+      base::Bind(::media::MojoMediaApplication::CreateAppWithClient,
+                 base::Bind(&media::CastMojoMediaClient::Create))));
 #endif
 }