Let content embedders register in-process media service.

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 199744d3cb65163c9c4937249243fcff28824e91..9e83b3727686425256c99a0e1ba964eae97989c5 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -30,11 +30,6 @@
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/static_application_loader.h"
 
-#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \
-    defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
-#include "media/mojo/services/mojo_media_application.h"
-#endif
-
 namespace content {
 
 namespace {
@@ -251,13 +246,7 @@ MojoShellContext::MojoShellContext() {
         app.first);
   }
 
-#if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-  application_manager_->SetLoaderForURL(
-      scoped_ptr<mojo::shell::ApplicationLoader>(
-          new mojo::shell::StaticApplicationLoader(
-              base::Bind(&media::MojoMediaApplication::CreateApp))),
-      GURL("mojo:media"));
-#elif(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+#if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
   application_manager_->SetLoaderForURL(
       scoped_ptr<mojo::shell::ApplicationLoader>(new GpuProcessLoader()),
       GURL("mojo:media"));