media: Rename MojoMediaApplication to MediaService

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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/shell/browser/shell_content_browser_client.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 45 matching lines @@
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "content/public/common/content_descriptors.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/common/sandbox_win.h"
 #include "sandbox/win/src/sandbox.h"
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-#include "media/mojo/services/mojo_media_application_factory.h"  // nogncheck
+#include "media/mojo/services/media_service_factory.h"  // nogncheck
 #endif
 
 namespace content {
 
 namespace {
 
 ShellContentBrowserClient* g_browser_client;
 bool g_swap_processes_for_redirect = false;
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ skipping 107 matching lines @@
     if (url.scheme() == kProtocolList[i])
       return true;
   }
   return false;
 }
 
 void ShellContentBrowserClient::RegisterInProcessServices(
     StaticServiceMap* services) {
 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
   content::ServiceInfo info;
-  info.factory = base::Bind(&media::CreateMojoMediaApplication);
+  info.factory = base::Bind(&media::CreateMediaService);
   services->insert(std::make_pair("service:media", info));
 #endif
 }
 
 void ShellContentBrowserClient::RegisterOutOfProcessServices(
       OutOfProcessServiceMap* services) {
   services->insert(std::make_pair(kTestServiceUrl,
                                   base::UTF8ToUTF16("Test Service")));
 }
 
@@ skipping 167 matching lines @@
 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
 }  // namespace content