Service Manager: Rework Service and ServiceContext lifetime

ui/views/mus/views_aura_mus_test_suite.cc

 // 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.
 
 #include "ui/views/mus/views_aura_mus_test_suite.h"
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 class DefaultService : public service_manager::Service {
  public:
   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);
 };
 
 class PlatformTestHelperMus : public PlatformTestHelper {
  public:
   PlatformTestHelperMus(service_manager::Connector* connector,
                         const service_manager::Identity& identity) {
     // It is necessary to recreate the MusClient for each test,
     // since a new MessageLoop is created for each test.
@@ skipping 61 matching lines @@
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
     thread_.task_runner()->PostTask(
         FROM_HERE, base::Bind(&ServiceManagerConnection::CloneConnector,
                               base::Unretained(this), &wait));
     wait.Wait();
     DCHECK(service_manager_connector_);
     return service_manager_connector_.get();
   }
 
   void CloneConnector(base::WaitableEvent* wait) {
-    service_manager_connector_ =
-        service_manager_connection_->connector()->Clone();
+    service_manager_connector_ = context_->connector()->Clone();
     wait->Signal();
   }
 
   void SetUpConnections(base::WaitableEvent* wait) {
     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();
   }
 
   // Returns the name of the test executable, e.g. "exe:views_mus_unittests".
   std::string GetTestName() {
     base::FilePath executable = base::CommandLine::ForCurrentProcess()
                                     ->GetProgram()
                                     .BaseName()
                                     .RemoveExtension();
     return std::string("exe:") + executable.MaybeAsASCII();
   }
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection);
 };
 
 ViewsAuraMusTestSuite::ViewsAuraMusTestSuite(int argc, char** argv)
     : ViewsTestSuite(argc, argv) {}
 
 ViewsAuraMusTestSuite::~ViewsAuraMusTestSuite() {}
 
 void ViewsAuraMusTestSuite::Initialize() {
   PlatformTestHelper::SetIsMus();
   // Let other services know that we're running in tests. Do this with a
   // command line flag to avoid making blocking calls to other processes for
   // setup for tests (e.g. to unlock the screen in the window manager).
   EnsureCommandLineSwitch(ui::switches::kUseTestConfig);
 
   ViewsTestSuite::Initialize();
   service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
 }
 
 void ViewsAuraMusTestSuite::Shutdown() {
   service_manager_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views