Rename mojo: to service:

services/shell/service_manager.cc

 // Copyright 2014 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 "services/shell/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 15 matching lines @@
 #include "services/shell/public/cpp/names.h"
 #include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/public/interfaces/service.mojom.h"
 #include "services/shell/public/interfaces/service_manager.mojom.h"
 
 namespace shell {
 
 namespace {
 
-const char kCatalogName[] = "mojo:catalog";
-const char kServiceManagerName[] = "mojo:shell";
+const char kCatalogName[] = "service:catalog";
+const char kServiceManagerName[] = "service:shell";
 const char kCapabilityClass_UserID[] = "shell:user_id";
 const char kCapabilityClass_ClientProcess[] = "shell:client_process";
 const char kCapabilityClass_InstanceName[] = "shell:instance_name";
 const char kCapabilityClass_AllUsers[] = "shell:all_users";
 const char kCapabilityClass_ExplicitClass[] = "shell:explicit_class";
 
 }  // namespace
 
 Identity CreateServiceManagerIdentity() {
   return Identity(kServiceManagerName, mojom::kRootUserID);
@@ skipping 271 matching lines @@
 
   bool ValidateClientProcessConnection(
       mojom::ClientProcessConnectionPtr* client_process_connection,
       const Identity& target,
       const ConnectCallback& callback) {
     if (!client_process_connection->is_null()) {
       if (!HasClass(capability_spec_, kCapabilityClass_ClientProcess)) {
         LOG(ERROR) << "Instance: " << identity_.name() << " attempting "
                    << "to register an instance for a process it created for "
                    << "target: " << target.name() << " without the "
-                   << "mojo:shell{client_process} capability class.";
+                   << "service:shell{client_process} capability class.";
         callback.Run(mojom::ConnectResult::ACCESS_DENIED,
                      mojom::kInheritUserID);
         return false;
       }
 
       if (!(*client_process_connection)->service.is_valid() ||
           !(*client_process_connection)->pid_receiver_request.is_valid()) {
         LOG(ERROR) << "Must supply both service AND "
                    << "pid_receiver_request when sending "
                    << "client_process_connection.";
@@ skipping 28 matching lines @@
       callback.Run(mojom::ConnectResult::ACCESS_DENIED,
                    mojom::kInheritUserID);
       return false;
     }
     if (!target.instance().empty() &&
         target.instance() != GetNamePath(target.name()) &&
         !HasClass(capability_spec_, kCapabilityClass_InstanceName)) {
       LOG(ERROR) << "Instance: " << identity_.name() << " attempting to "
                   << "connect to " << target.name() << " using Instance name: "
                   << target.instance() << " without the "
-                  << "mojo:shell{instance_name} capability class.";
+                  << "service:shell{instance_name} capability class.";
       callback.Run(mojom::ConnectResult::ACCESS_DENIED, mojom::kInheritUserID);
       return false;
 
     }
 
     if (allow_any_application_ ||
         capability_spec_.required.find(target.name()) !=
             capability_spec_.required.end()) {
       return true;
     }
@@ skipping 460 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell