Service Manager: Rework Service and ServiceContext lifetime

mash/init/init.h

Index: mash/init/init.h
diff --git a/mash/init/init.h b/mash/init/init.h
index d8d3a6335b785b46b72f10fa25a16daf78f1f67b..4ee523f1b54a4cd60c6be64a525868506c0c6834 100644
--- a/mash/init/init.h
+++ b/mash/init/init.h
@@ -13,10 +13,12 @@
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 
-namespace mojo {
+namespace service_manager {
 class Connection;
+class ServiceContext;
 }
 
 namespace mash {
@@ -31,7 +33,7 @@ class Init : public service_manager::Service,
 
  private:
   // 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;
 
@@ -49,6 +51,8 @@ class Init : public service_manager::Service,
   void StartTracing();
   void StartLogin();
 
+  service_manager::ServiceContext* context_ = nullptr;
+
   std::unique_ptr<service_manager::Connection> login_connection_;
   mojo::BindingSet<mojom::Init> init_bindings_;
   std::map<std::string, std::unique_ptr<service_manager::Connection>>