Let content embedders register in-process media service.

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/mojo/mojo_shell_context.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
 #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 {
 
 // An extra set of apps to register on initialization, if set by a test.
 const MojoShellContext::StaticApplicationMap* g_applications_for_test;
 
 void StartUtilityProcessOnIOThread(
     mojo::InterfaceRequest<ProcessControl> request,
     const base::string16& process_name,
@@ skipping 196 matching lines @@
   GetContentClient()
       ->browser()
       ->RegisterUnsandboxedOutOfProcessMojoApplications(&unsandboxed_apps);
   for (const auto& app : unsandboxed_apps) {
     application_manager_->SetLoaderForURL(
         scoped_ptr<mojo::shell::ApplicationLoader>(
             new UtilityProcessLoader(app.second, false /* use_sandbox */)),
         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"));
 #endif
 }
 
 MojoShellContext::~MojoShellContext() {
 }
 
 // static
@@ skipping 23 matching lines @@
                             mojo::shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(mojo::shell::Identity(url, std::string(), filter));
   params->set_services(std::move(request));
   params->set_exposed_services(std::move(exposed_services));
   params->set_on_application_end(base::Bind(&base::DoNothing));
   params->set_connect_callback(callback);
   application_manager_->ConnectToApplication(std::move(params));
 }
 
 }  // namespace content