Make Service own ServiceContext.

services/shell/tests/shutdown/shutdown_client_app.cc

Index: services/shell/tests/shutdown/shutdown_client_app.cc
diff --git a/services/shell/tests/shutdown/shutdown_client_app.cc b/services/shell/tests/shutdown/shutdown_client_app.cc
index 3eadc4739a1def17df4ce4112d3ad01877ce3214..5b3cc4146114529394c0b07f4f72ffbe475bb9ad 100644
--- a/services/shell/tests/shutdown/shutdown_client_app.cc
+++ b/services/shell/tests/shutdown/shutdown_client_app.cc
@@ -25,11 +25,6 @@ class ShutdownClientApp
 
  private:
   // shell::Service:
-  void OnStart(Connector* connector, const Identity& identity,
-               uint32_t id) override {
-    connector_ = connector;
-  }
-
   bool OnConnect(Connection* connection) override {
     connection->AddInterface<mojom::ShutdownTestClientController>(this);
     return true;
@@ -44,7 +39,8 @@ class ShutdownClientApp
   // mojom::ShutdownTestClientController:
   void ConnectAndWait(const ConnectAndWaitCallback& callback) override {
     mojom::ShutdownTestServicePtr service;
-    connector_->ConnectToInterface("mojo:shutdown_service", &service);
+    connector()->ConnectToInterface("mojo:shutdown_service",
+                                               &service);
 
     mojo::Binding<mojom::ShutdownTestClient> client_binding(this);
 
@@ -62,7 +58,6 @@ class ShutdownClientApp
     callback.Run();
   }
 
-  Connector* connector_ = nullptr;
   mojo::BindingSet<mojom::ShutdownTestClientController> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp);