Replace remaining shell references with service manager

services/service_manager/public/cpp/service_context.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 40 matching lines @@
   ServiceContext(service_manager::Service* service,
                  mojom::ServiceRequest request,
                  std::unique_ptr<Connector> connector = nullptr,
                  mojom::ConnectorRequest connector_request = nullptr);
 
   ~ServiceContext() override;
 
   Connector* connector() { return connector_.get(); }
   const Identity& identity() { return identity_; }
 
-  // Specify a function to be called when the connection to the shell is lost.
+  // Specify a function to be called when the connection to the service manager
+  // is lost.
   // Note that if connection has already been lost, then |closure| is called
   // immediately.
   void SetConnectionLostClosure(const base::Closure& closure);
 
  private:
   // mojom::Service:
   void OnStart(const Identity& identity,
                const OnStartCallback& callback) override;
   void OnConnect(const Identity& source,
                  mojom::InterfaceProviderRequest interfaces,
@@ skipping 20 matching lines @@
   bool should_run_connection_lost_closure_ = false;
 
   base::Closure connection_lost_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceContext);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_