Replace remaining shell references with 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 65 matching lines @@
       service_manager::mojom::ServiceRequest request) {
     DCHECK(task_runner_->BelongsToCurrentThread());
 
     if (!service_) {
       service_ = factory_callback_.Run(
           base::Bind(&Instance::Quit, base::Unretained(this)));
     }
 
     service_manager::ServiceContext* new_connection =
         new service_manager::ServiceContext(service_.get(), std::move(request));
-    shell_connections_.push_back(base::WrapUnique(new_connection));
+    service_manager_connections_.push_back(base::WrapUnique(new_connection));
     new_connection->SetConnectionLostClosure(
         base::Bind(&Instance::OnStop, base::Unretained(this),
                    new_connection));
   }
 
   void OnStop(service_manager::ServiceContext* connection) {
     DCHECK(task_runner_->BelongsToCurrentThread());
 
-    for (auto it = shell_connections_.begin(); it != shell_connections_.end();
-         ++it) {
+    for (auto it = service_manager_connections_.begin();
+         it != service_manager_connections_.end(); ++it) {
       if (it->get() == connection) {
-        shell_connections_.erase(it);
+        service_manager_connections_.erase(it);
         break;
       }
     }
   }
 
   void Quit() {
     DCHECK(task_runner_->BelongsToCurrentThread());
 
-    shell_connections_.clear();
+    service_manager_connections_.clear();
     service_.reset();
     if (quit_task_runner_->BelongsToCurrentThread()) {
       QuitOnRunnerThread();
     } else {
       quit_task_runner_->PostTask(
           FROM_HERE, base::Bind(&Instance::QuitOnRunnerThread, this));
     }
   }
 
   void QuitOnRunnerThread() {
@@ skipping 17 matching lines @@
 
   // 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<service_manager::Service> service_;
   std::vector<std::unique_ptr<service_manager::ServiceContext>>
-      shell_connections_;
+      service_manager_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()));
@@ skipping 12 matching lines @@
     const base::Closure& quit_closure) {
   quit_closure_ = quit_closure;
 }
 
 void EmbeddedServiceRunner::OnQuit() {
   if (!quit_closure_.is_null())
     quit_closure_.Run();
 }
 
 }  // namespace content