Rename mojo: to 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 <memory>
 #include <string>
 #include <utility>
 
@@ skipping 195 matching lines @@
 
     static const struct ManifestInfo {
       const char* name;
       int resource_id;
     } kManifests[] = {
       { kBrowserMojoApplicationName, IDR_MOJO_CONTENT_BROWSER_MANIFEST },
       { kGpuMojoApplicationName, IDR_MOJO_CONTENT_GPU_MANIFEST },
       { kPluginMojoApplicationName, IDR_MOJO_CONTENT_PLUGIN_MANIFEST },
       { kRendererMojoApplicationName, IDR_MOJO_CONTENT_RENDERER_MANIFEST },
       { kUtilityMojoApplicationName, IDR_MOJO_CONTENT_UTILITY_MANIFEST },
-      { "mojo:catalog", IDR_MOJO_CATALOG_MANIFEST },
+      { "service:catalog", IDR_MOJO_CATALOG_MANIFEST },
       { file::kFileServiceName, IDR_MOJO_FILE_MANIFEST }
     };
 
     for (size_t i = 0; i < arraysize(kManifests); ++i) {
       std::string contents = GetContentClient()->GetDataResource(
           kManifests[i].resource_id,
           ui::ScaleFactor::SCALE_FACTOR_NONE).as_string();
       DCHECK(!contents.empty());
       std::unique_ptr<base::Value> manifest_value =
           base::JSONReader::Read(contents);
@@ skipping 48 matching lines @@
       ->RegisterUnsandboxedOutOfProcessMojoApplications(&unsandboxed_apps);
   for (const auto& app : unsandboxed_apps) {
     MojoShellConnection::GetForProcess()->AddServiceRequestHandler(
         app.first,
         base::Bind(&StartServiceInUtilityProcess, app.first, app.second,
                    false /* use_sandbox */));
   }
 
 #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
   MojoShellConnection::GetForProcess()->AddServiceRequestHandler(
-      "mojo:media", base::Bind(&StartServiceInGpuProcess, "mojo:media"));
+      "service:media", base::Bind(&StartServiceInGpuProcess, "service:media"));
 #endif
 }
 
 MojoShellContext::~MojoShellContext() {
   // NOTE: The in-process ServiceManager MUST be destroyed before the browser
   // process-wide MojoShellConnection. Otherwise it's possible for the
-  // ServiceManager to receive connection requests for exe:content_browser which
-  // it may attempt to service by launching a new instance of the browser.
+  // ServiceManager to receive connection requests for service:content_browser
+  // which it may attempt to service by launching a new instance of the browser.
   if (in_process_context_)
     in_process_context_->ShutDown();
   if (MojoShellConnection::GetForProcess())
     MojoShellConnection::DestroyForProcess();
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 shell::Connector* MojoShellContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content