Replace remaining shell references with service manager

services/service_manager/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/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 112 matching lines @@
   blocking_pool_->Shutdown();
 }
 
 // static
 void Context::EnsureEmbedderIsInitialized() {
   static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
   setup.Get();
 }
 
 void Context::Init(std::unique_ptr<InitParams> init_params) {
-  TRACE_EVENT0("mojo_shell", "Context::Init");
+  TRACE_EVENT0("service_manager", "Context::Init");
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   bool trace_startup = command_line.HasSwitch(::switches::kTraceStartup);
   if (trace_startup) {
     tracer_.Start(
         command_line.GetSwitchValueASCII(::switches::kTraceStartup),
         command_line.GetSwitchValueASCII(::switches::kTraceStartupDuration),
         "mojo_runner.trace");
   }
@@ skipping 71 matching lines @@
 
   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));
   }
 
-  // Record the shell startup metrics used for performance testing.
+  // Record the service manager startup metrics used for performance testing.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           tracing::kEnableStatsCollectionBindings)) {
     tracing::mojom::StartupPerformanceDataCollectorPtr collector;
     tracing_remote_interfaces->GetInterface(
         tracing::mojom::StartupPerformanceDataCollector::Name_,
         mojo::GetProxy(&collector).PassMessagePipe());
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
     // CurrentProcessInfo::CreationTime is only defined on some platforms.
     const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
-    collector->SetShellProcessCreationTime(creation_time.ToInternalValue());
+    collector->SetServiceManagerProcessCreationTime(
+        creation_time.ToInternalValue());
 #endif
-    collector->SetShellMainEntryPointTime(main_entry_time_.ToInternalValue());
+    collector->SetServiceManagerMainEntryPointTime(
+        main_entry_time_.ToInternalValue());
   }
 }
 
 void Context::Shutdown() {
-  // Actions triggered by Shell's destructor may require a current message loop,
+  // Actions triggered by Service Manager's destructor may require a current
+  // message loop,
   // so we should destruct it explicitly now as ~Context() occurs post message
   // loop shutdown.
   service_manager_.reset();
 
   DCHECK_EQ(base::ThreadTaskRunnerHandle::Get(), service_manager_runner_);
 
   // If we didn't initialize the edk we should not shut it down.
   if (!init_edk_)
     return;
 
-  TRACE_EVENT0("mojo_shell", "Context::Shutdown");
+  TRACE_EVENT0("service_manager", "Context::Shutdown");
   // Post a task in case OnShutdownComplete is called synchronously.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(mojo::edk::ShutdownIPCSupport));
   // We'll quit when we get OnShutdownComplete().
   base::RunLoop().Run();
 }
 
 void Context::OnShutdownComplete() {
   DCHECK_EQ(base::ThreadTaskRunnerHandle::Get(), service_manager_runner_);
   base::MessageLoop::current()->QuitWhenIdle();
@@ skipping 22 matching lines @@
   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 service_manager