media: Support MojoMediaApplication in GPU process.

content/browser/mojo/mojo_shell_context.cc

Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 77e34e8a69be88b9aff4d39a51e737b402800e2f..e3596944c94add0fa90e606f6f3e06ba7407076c 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -28,7 +28,8 @@
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 
-#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
+#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \
+    defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
 #include "media/mojo/services/mojo_media_application.h"
 #endif
 
@@ -252,7 +253,11 @@ MojoShellContext::MojoShellContext() {
       scoped_ptr<mojo::shell::ApplicationLoader>(
           new mojo::shell::StaticApplicationLoader(
               base::Bind(&media::MojoMediaApplication::CreateApp))),
-      media::MojoMediaApplication::AppUrl());
+      GURL("mojo:media"));
+#elif(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+  application_manager_->SetLoaderForURL(
+      scoped_ptr<mojo::shell::ApplicationLoader>(new GpuProcessLoader()),
+      GURL("mojo:media"));
 #endif
 }