Service Manager: Rework Service and ServiceContext lifetime

ui/views/mus/views_mus_test_suite.cc

Index: ui/views/mus/views_mus_test_suite.cc
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
index a08b1e2ae1dc90d0ceb0c87d831ff81c48d62188..1ace18322f109cd7eb43446e35a4b997ad40e43a 100644
--- a/ui/views/mus/views_mus_test_suite.cc
+++ b/ui/views/mus/views_mus_test_suite.cc
@@ -37,6 +37,12 @@ class DefaultService : public service_manager::Service {
   DefaultService() {}
   ~DefaultService() override {}
 
+  // service_manager::Service:
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
+                 service_manager::InterfaceRegistry* registry) override {
+    return false;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultService);
 };
@@ -112,8 +118,7 @@ class ServiceManagerConnection {
   }
 
   void CloneConnector(base::WaitableEvent* wait) {
-    service_manager_connector_ =
-        service_manager_connection_->connector()->Clone();
+    service_manager_connector_ = context_->connector()->Clone();
     wait->Signal();
   }
 
@@ -121,23 +126,21 @@ class ServiceManagerConnection {
     background_service_manager_ =
         base::MakeUnique<service_manager::BackgroundServiceManager>();
     background_service_manager_->Init(nullptr);
-    service_ = base::MakeUnique<DefaultService>();
-    service_manager_connection_ =
+    context_ =
         base::MakeUnique<service_manager::ServiceContext>(
-            service_.get(),
+            base::MakeUnique<DefaultService>(),
             background_service_manager_->CreateServiceRequest(GetTestName()));
 
     // ui/views/mus requires a WindowManager running, so launch test_wm.
-    service_manager::Connector* connector =
-        service_manager_connection_->connector();
+    service_manager::Connector* connector = context_->connector();
     connector->Connect("service:test_wm");
     service_manager_connector_ = connector->Clone();
-    service_manager_identity_ = service_manager_connection_->identity();
+    service_manager_identity_ = context_->identity();
     wait->Signal();
   }
 
   void TearDownConnections(base::WaitableEvent* wait) {
-    service_manager_connection_.reset();
+    context_.reset();
     wait->Signal();
   }
 
@@ -153,8 +156,7 @@ class ServiceManagerConnection {
   base::Thread thread_;
   std::unique_ptr<service_manager::BackgroundServiceManager>
       background_service_manager_;
-  std::unique_ptr<service_manager::ServiceContext> service_manager_connection_;
-  std::unique_ptr<DefaultService> service_;
+  std::unique_ptr<service_manager::ServiceContext> context_;
   std::unique_ptr<service_manager::Connector> service_manager_connector_;
   service_manager::Identity service_manager_identity_;