[Chromecast] Hook up mojo media pipeline.

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 b4903178c7632b07690b8f2e25a147b990c30472..aea55a6cf487074dcf5634b9d80ef96b953a42b2 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -51,6 +51,11 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/gl/gl_switches.h"
 
+#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+// nogncheck because of conditional dependency.
+#include "media/mojo/services/mojo_media_application.h"  // nogncheck

[xhwang, 2016/02/02 20:25:16]

cool with "nogncheck" :)

[alokp, 2016/02/02 20:37:00]

this is a common pattern in GN for conditional dependencies.

+#endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
+
 #if defined(OS_ANDROID)
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "components/external_video_surface/browser/android/external_video_surface_container_impl.h"
@@ -349,11 +354,12 @@ bool CastContentBrowserClient::CanCreateWindow(
   return false;
 }
 
-void CastContentBrowserClient::RegisterUnsandboxedOutOfProcessMojoApplications(
-    std::map<GURL, base::string16>* apps) {
-#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
-  apps->insert(std::make_pair(GURL("mojo:media"),
-                              base::ASCIIToUTF16("Media App")));
+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)));
 #endif
 }