Service Manager: Rework Service and ServiceContext lifetime

services/service_manager/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_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoop;
 }
 
 namespace service_manager {
 
 class BackgroundServiceManager;
+class ServiceContext;
 
 namespace test {
 
 class ServiceTest;
 
 // 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(const ServiceInfo& info) override;
+  void OnStart(ServiceContext* context) override;
+  bool OnConnect(const ServiceInfo& remote_info,
+                 InterfaceRegistry* registry) override;
 
  private:
   ServiceTest* test_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTestClient);
 };
 
 class ServiceTest : public testing::Test {
  public:
   ServiceTest();
@@ skipping 28 matching lines @@
                      const std::string& name,
                      const std::string& userid);
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend ServiceTestClient;
 
-  std::unique_ptr<Service> service_;
-
+  std::unique_ptr<ServiceContext> context_;
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<BackgroundServiceManager> background_service_manager_;
-  std::unique_ptr<ServiceContext> service_context_;
 
   // See constructor.
   std::string test_name_;
 
   Connector* connector_ = nullptr;
   std::string initialize_name_;
   std::string initialize_userid_ = service_manager::mojom::kInheritUserID;
   uint32_t initialize_instance_id_ = service_manager::mojom::kInvalidInstanceID;
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTest);
 };
 
 }  // namespace test
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_