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

services/service_manager/tests/lifecycle/package.cc

Index: services/service_manager/tests/lifecycle/package.cc
diff --git a/services/service_manager/tests/lifecycle/package.cc b/services/service_manager/tests/lifecycle/package.cc
index 72874098c15adff84abdfab80978b8a6d7a08279..1be7d9353a3a6f3cccc487d232110f0940867c47 100644
--- a/services/service_manager/tests/lifecycle/package.cc
+++ b/services/service_manager/tests/lifecycle/package.cc
@@ -40,6 +40,10 @@
 
  private:
   // service_manager::Service:
+  void OnStart(service_manager::ServiceContext* context) override {
+    context_ = context;
+  }
+
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<service_manager::test::mojom::LifecycleControl>(
@@ -74,7 +78,7 @@
 
   void CloseServiceManagerConnection() override {
     service_manager_connection_closed_callback_.Run();
-    context()->QuitNow();
+    context_->QuitNow();
     // This only closed our relationship with the service manager, existing
     // |bindings_|
     // remain active.
@@ -87,6 +91,7 @@
     }
   }
 
+  service_manager::ServiceContext* context_;
   mojo::BindingSet<service_manager::test::mojom::LifecycleControl> bindings_;
 
   // Run when this object's connection to the service manager is closed.
@@ -107,7 +112,9 @@
 
  private:
   // service_manager::Service:
-  void OnStart() override { app_client_.OnStart(); }
+  void OnStart(service_manager::ServiceContext* context) override {
+    app_client_.OnStart(context);
+  }
 
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {