Replace remaining shell references with service manager

services/service_manager/background/background_service_manager.cc

 // Copyright 2016 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/background/background_shell.h"
+#include "services/service_manager/background/background_service_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_default.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 23 matching lines @@
 
   void BindToCurrentThread() { base::MessageLoop::BindToCurrentThread(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MojoMessageLoop);
 };
 
 }  // namespace
 
 // Manages the thread to startup mojo.
-class BackgroundShell::MojoThread : public base::SimpleThread {
+class BackgroundServiceManager::MojoThread : public base::SimpleThread {
  public:
-  explicit MojoThread(std::unique_ptr<BackgroundShell::InitParams> init_params)
-      : SimpleThread("mojo-background-shell"),
+  explicit MojoThread(
+      std::unique_ptr<BackgroundServiceManager::InitParams> init_params)
+      : SimpleThread("background-service-manager"),
         init_params_(std::move(init_params)) {}
   ~MojoThread() override {}
 
   void CreateServiceRequest(base::WaitableEvent* signal,
-                                const std::string& name,
-                                mojom::ServiceRequest* request) {
+                            const std::string& name,
+                            mojom::ServiceRequest* request) {
     // Only valid to call this on the background thread.
     DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
     *request = context_->service_manager()->StartEmbedderService(name);
     signal->Signal();
   }
 
   void Connect(std::unique_ptr<ConnectParams> params) {
     context_->service_manager()->Connect(std::move(params));
   }
 
   base::MessageLoop* message_loop() { return message_loop_; }
 
   // Stops the background thread.
   void Stop() {
     DCHECK_NE(message_loop_, base::MessageLoop::current());
     message_loop_->task_runner()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     Join();
   }
 
   void RunServiceManagerCallback(
-      const BackgroundShell::ServiceManagerThreadCallback& callback) {
+      const BackgroundServiceManager::ServiceManagerThreadCallback& callback) {
     DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
     callback.Run(context_->service_manager());
   }
 
   // base::SimpleThread:
   void Start() override {
     DCHECK(!message_loop_);
     message_loop_ = new MojoMessageLoop;
     base::SimpleThread::Start();
   }
@@ skipping 30 matching lines @@
     context_ = nullptr;
   }
 
  private:
   // We own this. It's created on the main thread, but destroyed on the
   // background thread.
   MojoMessageLoop* message_loop_ = nullptr;
   // Created in Run() on the background thread.
   Context* context_ = nullptr;
 
-  std::unique_ptr<BackgroundShell::InitParams> init_params_;
+  std::unique_ptr<BackgroundServiceManager::InitParams> init_params_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoThread);
 };
 
-BackgroundShell::InitParams::InitParams() {}
-BackgroundShell::InitParams::~InitParams() {}
+BackgroundServiceManager::InitParams::InitParams() {}
+BackgroundServiceManager::InitParams::~InitParams() {}
 
-BackgroundShell::BackgroundShell() {}
+BackgroundServiceManager::BackgroundServiceManager() {}
 
-BackgroundShell::~BackgroundShell() {
+BackgroundServiceManager::~BackgroundServiceManager() {
   thread_->Stop();
 }
 
-void BackgroundShell::Init(std::unique_ptr<InitParams> init_params) {
+void BackgroundServiceManager::Init(std::unique_ptr<InitParams> init_params) {
   DCHECK(!thread_);
   thread_.reset(new MojoThread(std::move(init_params)));
   thread_->Start();
 }
 
-mojom::ServiceRequest BackgroundShell::CreateServiceRequest(
+mojom::ServiceRequest BackgroundServiceManager::CreateServiceRequest(
     const std::string& name) {
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   mojom::ServiceRequest request;
   base::WaitableEvent signal(base::WaitableEvent::ResetPolicy::MANUAL,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&MojoThread::CreateServiceRequest,
                  base::Unretained(thread_.get()), &signal, name, &request));
   signal.Wait();
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&MojoThread::Connect, base::Unretained(thread_.get()),
                  base::Passed(&params)));
   return request;
 }
 
-void BackgroundShell::ExecuteOnServiceManagerThread(
+void BackgroundServiceManager::ExecuteOnServiceManagerThread(
     const ServiceManagerThreadCallback& callback) {
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::RunServiceManagerCallback,
                             base::Unretained(thread_.get()), callback));
 }
 
 }  // namespace service_manager