Rename shell namespace to service_manager

content/common/service_manager/embedded_service_runner.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 "content/common/service_manager/embedded_service_runner.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 15 matching lines @@
       : name_(name.as_string()),
         factory_callback_(info.factory),
         use_own_thread_(!info.task_runner && info.use_own_thread),
         quit_closure_(quit_closure),
         quit_task_runner_(base::ThreadTaskRunnerHandle::Get()),
         task_runner_(info.task_runner) {
     if (!use_own_thread_ && !task_runner_)
       task_runner_ = base::ThreadTaskRunnerHandle::Get();
   }
 
-  void BindServiceRequest(shell::mojom::ServiceRequest request) {
+  void BindServiceRequest(service_manager::mojom::ServiceRequest request) {
     DCHECK(runner_thread_checker_.CalledOnValidThread());
 
     if (use_own_thread_ && !thread_) {
       // Start a new thread if necessary.
       thread_.reset(new base::Thread(name_));
       thread_->Start();
       task_runner_ = thread_->task_runner();
     }
 
     DCHECK(task_runner_);
@@ skipping 19 matching lines @@
  private:
   friend class base::RefCountedThreadSafe<Instance>;
 
   ~Instance() {
     // If this instance had its own thread, it MUST be explicitly destroyed by
     // QuitOnRunnerThread() by the time this destructor is run.
     DCHECK(!thread_);
   }
 
   void BindServiceRequestOnApplicationThread(
-      shell::mojom::ServiceRequest request) {
+      service_manager::mojom::ServiceRequest request) {
     DCHECK(task_runner_->BelongsToCurrentThread());
 
     if (!service_) {
       service_ = factory_callback_.Run(
           base::Bind(&Instance::Quit, base::Unretained(this)));
     }
 
-    shell::ServiceContext* new_connection =
-        new shell::ServiceContext(service_.get(), std::move(request));
+    service_manager::ServiceContext* new_connection =
+        new service_manager::ServiceContext(service_.get(), std::move(request));
     shell_connections_.push_back(base::WrapUnique(new_connection));
     new_connection->SetConnectionLostClosure(
         base::Bind(&Instance::OnStop, base::Unretained(this),
                    new_connection));
   }
 
-  void OnStop(shell::ServiceContext* connection) {
+  void OnStop(service_manager::ServiceContext* connection) {
     DCHECK(task_runner_->BelongsToCurrentThread());
 
     for (auto it = shell_connections_.begin(); it != shell_connections_.end();
          ++it) {
       if (it->get() == connection) {
         shell_connections_.erase(it);
         break;
       }
     }
   }
@@ skipping 30 matching lines @@
   // runner's (i.e. our owner's) thread.
   base::ThreadChecker runner_thread_checker_;
 
   // These fields must only be accessed from the runner's thread.
   std::unique_ptr<base::Thread> thread_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // These fields must only be accessed from the application thread, except in
   // the destructor which may run on either the runner thread or the application
   // thread.
-  std::unique_ptr<shell::Service> service_;
-  std::vector<std::unique_ptr<shell::ServiceContext>> shell_connections_;
+  std::unique_ptr<service_manager::Service> service_;
+  std::vector<std::unique_ptr<service_manager::ServiceContext>>
+      shell_connections_;
 
   DISALLOW_COPY_AND_ASSIGN(Instance);
 };
 
 EmbeddedServiceRunner::EmbeddedServiceRunner(const base::StringPiece& name,
                                              const ServiceInfo& info)
     : weak_factory_(this) {
   instance_ = new Instance(name, info,
                            base::Bind(&EmbeddedServiceRunner::OnQuit,
                                       weak_factory_.GetWeakPtr()));
 }
 
 EmbeddedServiceRunner::~EmbeddedServiceRunner() {
   instance_->ShutDown();
 }
 
 void EmbeddedServiceRunner::BindServiceRequest(
-    shell::mojom::ServiceRequest request) {
+    service_manager::mojom::ServiceRequest request) {
   instance_->BindServiceRequest(std::move(request));
 }
 
 void EmbeddedServiceRunner::SetQuitClosure(
     const base::Closure& quit_closure) {
   quit_closure_ = quit_closure;
 }
 
 void EmbeddedServiceRunner::OnQuit() {
   if (!quit_closure_.is_null())
     quit_closure_.Run();
 }
 
 }  // namespace content