ShellConnection -> ServiceContext

services/shell/service_manager.h

Index: services/shell/service_manager.h
diff --git a/services/shell/service_manager.h b/services/shell/service_manager.h
index 6a448cf91353ec5b1331d04496ebe7c1e1b9253e..5357d74d901e662d0b4970abaac59cf13734c1a3 100644
--- a/services/shell/service_manager.h
+++ b/services/shell/service_manager.h
@@ -27,7 +27,7 @@
 #include "services/shell/public/interfaces/service_manager.mojom.h"
 
 namespace shell {
-class ShellConnection;
+class ServiceContext;
 
 // Creates an identity for the Service Manager, used when the Service Manager
 // connects to services.
@@ -154,7 +154,7 @@ class ServiceManager : public Service {
   mojo::InterfacePtrSet<mojom::ServiceManagerListener> listeners_;
   base::Callback<void(const Identity&)> instance_quit_callback_;
   std::unique_ptr<NativeRunnerFactory> native_runner_factory_;
-  std::unique_ptr<ShellConnection> shell_connection_;
+  std::unique_ptr<ServiceContext> service_context_;
   base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);