Replace remaining shell references with service manager

services/tracing/service.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 "services/tracing/service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 12 matching lines @@
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Factory>(this);
   registry->AddInterface<mojom::Collector>(this);
   registry->AddInterface<mojom::StartupPerformanceDataCollector>(this);
   return true;
 }
 
 bool Service::OnStop() {
   // TODO(beng): This is only required because Service isn't run by
   // ServiceRunner - instead it's launched automatically by the standalone
-  // shell. It shouldn't be.
+  // service manager. It shouldn't be.
   base::MessageLoop::current()->QuitWhenIdle();
   return false;
 }
 
 void Service::Create(const service_manager::Identity& remote_identity,
                      mojom::FactoryRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void Service::Create(const service_manager::Identity& remote_identity,
@@ skipping 87 matching lines @@
         if (satisfied & MOJO_HANDLE_SIGNAL_READABLE)
           recorder_impls_[index]->TryRead();
         else if (satisfied & MOJO_HANDLE_SIGNAL_PEER_CLOSED)
           recorder_impls_.erase(recorder_impls_.begin() + index);
       }
     }
   }
   AllDataCollected();
 }
 
-void Service::SetShellProcessCreationTime(int64_t time) {
-  if (startup_performance_times_.shell_process_creation_time == 0)
-    startup_performance_times_.shell_process_creation_time = time;
+void Service::SetServiceManagerProcessCreationTime(int64_t time) {
+  if (startup_performance_times_.service_manager_process_creation_time == 0)
+    startup_performance_times_.service_manager_process_creation_time = time;
 }
 
-void Service::SetShellMainEntryPointTime(int64_t time) {
-  if (startup_performance_times_.shell_main_entry_point_time == 0)
-    startup_performance_times_.shell_main_entry_point_time = time;
+void Service::SetServiceManagerMainEntryPointTime(int64_t time) {
+  if (startup_performance_times_.service_manager_main_entry_point_time == 0)
+    startup_performance_times_.service_manager_main_entry_point_time = time;
 }
 
 void Service::SetBrowserMessageLoopStartTicks(int64_t ticks) {
   if (startup_performance_times_.browser_message_loop_start_ticks == 0)
     startup_performance_times_.browser_message_loop_start_ticks = ticks;
 }
 
 void Service::SetBrowserWindowDisplayTicks(int64_t ticks) {
   if (startup_performance_times_.browser_window_display_ticks == 0)
     startup_performance_times_.browser_window_display_ticks = ticks;
@@ skipping 18 matching lines @@
     const GetStartupPerformanceTimesCallback& callback) {
   callback.Run(startup_performance_times_.Clone());
 }
 
 void Service::AllDataCollected() {
   recorder_impls_.clear();
   sink_.reset();
 }
 
 }  // namespace tracing