Make Service own ServiceContext.

services/shell/public/cpp/service_test.h

Index: services/shell/public/cpp/service_test.h
diff --git a/services/shell/public/cpp/service_test.h b/services/shell/public/cpp/service_test.h
index ca3868eff8d5c09ec6acf8aa0cf794aaf9b5427f..714232ace35f51ff8cd0822125bab02669975ca7 100644
--- a/services/shell/public/cpp/service_test.h
+++ b/services/shell/public/cpp/service_test.h
@@ -35,9 +35,7 @@ class ServiceTestClient : public Service {
   ~ServiceTestClient() override;
 
  protected:
-  void OnStart(Connector* connector,
-               const Identity& identity,
-               uint32_t id) override;
+  void OnStart(const Identity& identity) override;
 
  private:
   ServiceTest* test_;
@@ -77,8 +75,7 @@ class ServiceTest : public testing::Test {
   // Call to set OnStart() metadata when GetService() is overridden.
   void OnStartCalled(Connector* connector,
                      const std::string& name,
-                     const std::string& userid,
-                     uint32_t id);
+                     const std::string& userid);
 
   // testing::Test:
   void SetUp() override;