Make Service own ServiceContext.

services/shell/public/cpp/service_test.h

 // Copyright 2016 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_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
 #define SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 17 matching lines @@
 // A default implementation of Service for use in ServiceTests. Tests wishing
 // to customize this should subclass this class instead of Service,
 // otherwise they will have to call ServiceTest::OnStartCalled() to forward
 // metadata from OnStart() to the test.
 class ServiceTestClient : public Service {
  public:
   explicit ServiceTestClient(ServiceTest* test);
   ~ServiceTestClient() override;
 
  protected:
-  void OnStart(Connector* connector,
-               const Identity& identity,
-               uint32_t id) override;
+  void OnStart(const Identity& identity) override;
 
  private:
   ServiceTest* test_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTestClient);
 };
 
 class ServiceTest : public testing::Test {
  public:
   ServiceTest();
@@ skipping 19 matching lines @@
   // via OnStart(). Override to customize, but custom implementations must
   // call OnStartCalled() to forward the metadata so test_name() etc all
   // work.
   virtual std::unique_ptr<Service> CreateService();
 
   virtual std::unique_ptr<base::MessageLoop> CreateMessageLoop();
 
   // 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;
   void TearDown() override;
 
  private:
   friend ServiceTestClient;
 
   std::unique_ptr<Service> service_;
 
@@ skipping 11 matching lines @@
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTest);
 };
 
 }  // namespace test
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_