Service Manager: Rework Service and ServiceContext lifetime

ash/mus/window_manager_application.cc

Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 0d739f00fb9712d6dacfe6f2c6a1628b780359f0..d12b63caed28137cf2cc7b9bdaeb6a5c8540c2c3 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -15,6 +15,7 @@
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service_context.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/public/cpp/gpu_service.h"
@@ -117,25 +118,26 @@ void WindowManagerApplication::ShutdownComponents() {
 }
 
 void WindowManagerApplication::OnStart(
-    const service_manager::ServiceInfo& info) {
-  aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity,
-                                                 "ash_mus_resources.pak",
-                                                 "ash_mus_resources_200.pak");
-  gpu_service_ = ui::GpuService::Create(connector());
+    service_manager::ServiceContext* context) {
+  context_ = context;
+  aura_init_ = base::MakeUnique<views::AuraInit>(
+      context->connector(), context->identity(), "ash_mus_resources.pak",
+      "ash_mus_resources_200.pak");
+  gpu_service_ = ui::GpuService::Create(context->connector());
   compositor_context_factory_.reset(
       new views::SurfaceContextFactory(gpu_service_.get()));
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
-  window_manager_.reset(new WindowManager(connector()));
+  window_manager_.reset(new WindowManager(context->connector()));
 
   MaterialDesignController::Initialize();
 
-  tracing_.Initialize(connector(), info.identity.name());
+  tracing_.Initialize(context->connector(), context->identity().name());
 
   std::unique_ptr<ui::WindowTreeClient> window_tree_client =
       base::MakeUnique<ui::WindowTreeClient>(window_manager_.get(),
                                              window_manager_.get());
-  window_tree_client->ConnectAsWindowManager(connector());
+  window_tree_client->ConnectAsWindowManager(context->connector());
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
@@ -152,7 +154,7 @@ bool WindowManagerApplication::OnConnect(
       registry, base::ThreadTaskRunnerHandle::Get());
 
   if (remote_info.identity.name() == "service:mash_session") {
-    connector()->ConnectToInterface(remote_info.identity, &session_);
+    context_->connector()->ConnectToInterface(remote_info.identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }