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

services/service_manager/tests/lifecycle/app_client.cc

Index: services/service_manager/tests/lifecycle/app_client.cc
diff --git a/services/service_manager/tests/lifecycle/app_client.cc b/services/service_manager/tests/lifecycle/app_client.cc
index 9ada68bed8af236baf274c493514e95a089b41a3..905260cf55fbc39775d0e8ae2d23ccd10d550d34 100644
--- a/services/service_manager/tests/lifecycle/app_client.cc
+++ b/services/service_manager/tests/lifecycle/app_client.cc
@@ -14,6 +14,10 @@
 AppClient::AppClient() {}
 
 AppClient::~AppClient() {}
+
+void AppClient::OnStart(ServiceContext* context) {
+  context_ = context;
+}
 
 bool AppClient::OnConnect(const ServiceInfo& remote_info,
                           InterfaceRegistry* registry) {
@@ -36,7 +40,7 @@
 }
 
 void AppClient::GracefulQuit() {
-  context()->RequestQuit();
+  context_->RequestQuit();
 }
 
 void AppClient::Crash() {
@@ -47,7 +51,7 @@
 }
 
 void AppClient::CloseServiceManagerConnection() {
-  context()->DisconnectFromServiceManager();
+  context_->DisconnectFromServiceManager();
   bindings_.set_connection_error_handler(
       base::Bind(&AppClient::BindingLost, base::Unretained(this)));
 }