Rename a bunch of Mojo Application stuff to reference Services.

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 169 matching lines @@
       url::kDataScheme,
       url::kFileScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
     if (url.scheme() == kProtocolList[i])
       return true;
   }
   return false;
 }
 
-void ShellContentBrowserClient::RegisterInProcessMojoApplications(
-    StaticMojoApplicationMap* apps) {
+void ShellContentBrowserClient::RegisterInProcessServices(
+    StaticServiceMap* services) {
 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-  content::MojoApplicationInfo app_info;
-  app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication);
-  apps->insert(std::make_pair("service:media", app_info));
+  content::ServiceInfo info;
+  info.factory = base::Bind(&media::CreateMojoMediaApplication);
+  services->insert(std::make_pair("service:media", info));
 #endif
 }
 
-void ShellContentBrowserClient::RegisterOutOfProcessMojoApplications(
-      OutOfProcessMojoApplicationMap* apps) {
-  apps->insert(std::make_pair(kTestServiceUrl,
-                              base::UTF8ToUTF16("Test Service")));
+void ShellContentBrowserClient::RegisterOutOfProcessServices(
+      OutOfProcessServiceMap* services) {
+  services->insert(std::make_pair(kTestServiceUrl,
+                                  base::UTF8ToUTF16("Test Service")));
 }
 
 std::unique_ptr<base::Value>
 ShellContentBrowserClient::GetServiceManifestOverlay(
     const std::string& name) {
   int id = -1;
-  if (name == content::kBrowserMojoApplicationName)
+  if (name == content::kBrowserServiceName)
     id = IDR_CONTENT_SHELL_BROWSER_MANIFEST_OVERLAY;
-  else if (name == content::kRendererMojoApplicationName)
+  else if (name == content::kRendererServiceName)
     id = IDR_CONTENT_SHELL_RENDERER_MANIFEST_OVERLAY;
-  else if (name == content::kUtilityMojoApplicationName)
+  else if (name == content::kUtilityServiceName)
     id = IDR_CONTENT_SHELL_UTILITY_MANIFEST_OVERLAY;
   if (id == -1)
     return nullptr;
 
   base::StringPiece manifest_contents =
       ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
           id, ui::ScaleFactor::SCALE_FACTOR_NONE);
   return base::JSONReader::Read(manifest_contents);
 }
 
@@ skipping 148 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