Service Manager: Rework Service and ServiceContext lifetime

ash/mus/window_manager_application.h

Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index 6dcd5facca3410ba29a625ac217387396722debe..9a9cf51c4fdce166290324d6da770a7085efa45d 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -29,6 +29,10 @@ class ScopedFakeStatisticsProvider;
 }
 }
 
+namespace service_manager {
+class ServiceContext;
+}
+
 namespace views {
 class AuraInit;
 class SurfaceContextFactory;
@@ -72,13 +76,15 @@ class WindowManagerApplication
   void ShutdownComponents();
 
   // service_manager::Service:
-  void OnStart(const service_manager::ServiceInfo& info) override;
+  void OnStart(service_manager::ServiceContext* context) override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
+  service_manager::ServiceContext* context_ = nullptr;
+
   tracing::Provider tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;