Make Service own ServiceContext.

services/shell/tests/shell/driver.cc

Index: services/shell/tests/shell/driver.cc
diff --git a/services/shell/tests/shell/driver.cc b/services/shell/tests/shell/driver.cc
index 6155bbcb29f8944c5b80c36c5aa6f967376fbf48..b78d174fc552b6014d1a9c9c72e13bfce50408a4 100644
--- a/services/shell/tests/shell/driver.cc
+++ b/services/shell/tests/shell/driver.cc
@@ -45,9 +45,7 @@ class Driver : public shell::Service,
 
  private:
   // shell::Service:
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override {
+  void OnStart(const shell::Identity& identity) override {
     base::FilePath target_path;
     CHECK(base::PathService::Get(base::DIR_EXE, &target_path));
   #if defined(OS_WIN)
@@ -84,7 +82,8 @@ class Driver : public shell::Service,
     shell::Connector::ConnectParams params(target);
     params.set_client_process_connection(std::move(client),
                                          GetProxy(&receiver));
-    std::unique_ptr<shell::Connection> connection = connector->Connect(&params);
+    std::unique_ptr<shell::Connection> connection =
+        connector()->Connect(&params);
     connection->AddConnectionCompletedClosure(
         base::Bind(&Driver::OnConnectionCompleted, base::Unretained(this)));