Rename mojo: to service:

services/shell/standalone/context.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 "services/shell/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 158 matching lines @@
   service_manager_.reset(new ServiceManager(std::move(runner_factory),
                                             catalog_->TakeService()));
 
   mojom::InterfaceProviderPtr tracing_remote_interfaces;
   mojom::InterfaceProviderPtr tracing_local_interfaces;
   mojo::MakeStrongBinding(base::MakeUnique<TracingInterfaceProvider>(&tracer_),
                           mojo::GetProxy(&tracing_local_interfaces));
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
-  params->set_target(Identity("mojo:tracing", mojom::kRootUserID));
+  params->set_target(Identity("service:tracing", mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&tracing_remote_interfaces));
   service_manager_->Connect(std::move(params));
 
   if (command_line.HasSwitch(tracing::kTraceStartup)) {
     tracing::mojom::CollectorPtr coordinator;
     auto coordinator_request = GetProxy(&coordinator);
     tracing_remote_interfaces->GetInterface(
         tracing::mojom::Collector::Name_,
         coordinator_request.PassMessagePipe());
     tracer_.StartCollectingFromTracingService(std::move(coordinator));
@@ skipping 42 matching lines @@
 
 void Context::RunCommandLineApplication() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   for (size_t i = 0; i < args.size(); ++i) {
 #if defined(OS_WIN)
     std::string possible_app = base::WideToUTF8(args[i]);
 #else
     std::string possible_app = args[i];
 #endif
-    if (GetNameType(possible_app) == "mojo") {
+    if (GetNameType(possible_app) == kNameType_Service) {
       Run(possible_app);
       break;
     }
   }
 }
 
 void Context::Run(const std::string& name) {
   service_manager_->SetInstanceQuitCallback(base::Bind(&OnInstanceQuit, name));
 
   mojom::InterfaceProviderPtr remote_interfaces;
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace shell