Revert of Service Manager: Remove ServiceContext* arg from Service::OnStart()

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 afc59d2bdde64f130ae4076be78903dc577e9eb7..b527b992589117070f80a4eaa074328d6611d68d 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/catalog_viewer/catalog_viewer.h
@@ -15,6 +15,10 @@
 #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;
@@ -37,7 +41,7 @@
 
  private:
   // service_manager::Service:
-  void OnStart() override;
+  void OnStart(service_manager::ServiceContext* context) override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
@@ -47,6 +51,8 @@
   // service_manager::InterfaceFactory<mojom::Launchable>:
   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_;