Service Manager: Rework Service and ServiceContext lifetime

mash/catalog_viewer/catalog_viewer.h

Index: mash/catalog_viewer/catalog_viewer.h
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h
index e2457160989eb58a7ae82bd24cf1478bf2d10e72..b527b992589117070f80a4eaa074328d6611d68d 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/catalog_viewer/catalog_viewer.h
@@ -12,9 +12,14 @@
 #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"
 
+namespace service_manager {
+class ServiceContext;
+}
+
 namespace views {
 class AuraInit;
 class Widget;
@@ -36,7 +41,7 @@ class CatalogViewer
 
  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;
 
@@ -47,6 +52,8 @@ class CatalogViewer
   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_;