Service Manager: Rework Service and ServiceContext lifetime

mash/browser/browser.h

Index: mash/browser/browser.h
diff --git a/mash/browser/browser.h b/mash/browser/browser.h
index 687e90d4292b18d84fca7215defbc92a8ef51524..f9fc353531d2d3eb1490f20a6db72cc795324f76 100644
--- a/mash/browser/browser.h
+++ b/mash/browser/browser.h
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/tracing/public/cpp/provider.h"
 
@@ -17,6 +18,10 @@ namespace navigation {
 class View;
 }
 
+namespace service_manager {
+class ServiceContext;
+}
+
 namespace views {
 class AuraInit;
 class Widget;
@@ -43,7 +48,7 @@ class Browser : 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;
 
@@ -54,6 +59,8 @@ class Browser : public service_manager::Service,
   void Create(const service_manager::Identity& remote_identity,
               mojom::LaunchableRequest request) override;
 
+  service_manager::ServiceContext* context_ = nullptr;
+
   mojo::BindingSet<mojom::Launchable> bindings_;
   std::vector<views::Widget*> windows_;