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

services/service_manager/tests/lifecycle/package.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 22 matching lines @@
             service_manager_connection_closed_callback),
         destruct_callback_(destruct_callback) {
     bindings_.set_connection_error_handler(base::Bind(&PackagedApp::BindingLost,
                                                       base::Unretained(this)));
   }
 
   ~PackagedApp() override {}
 
  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>(
         this);
     return true;
   }
 
   // service_manager::InterfaceFactory<LifecycleControl>
   void Create(
       const service_manager::Identity& remote_identity,
@@ skipping 14 matching lines @@
   }
 
   void Crash() override {
     // When multiple instances are vended from the same package instance, this
     // will cause all instances to be quit.
     exit(1);
   }
 
   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.
   }
 
   void BindingLost() {
     if (bindings_.empty()) {
       // Deletes |this|.
       destruct_callback_.Run();
     }
   }
 
+  service_manager::ServiceContext* context_;
   mojo::BindingSet<service_manager::test::mojom::LifecycleControl> bindings_;
 
   // Run when this object's connection to the service manager is closed.
   base::Closure service_manager_connection_closed_callback_;
   // Run when this object is destructed.
   base::Closure destruct_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PackagedApp);
 };
 
 class Package : public service_manager::Service,
                 public service_manager::InterfaceFactory<
                     service_manager::mojom::ServiceFactory>,
                 public service_manager::mojom::ServiceFactory {
  public:
   Package() {}
   ~Package() override {}
 
  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 {
     registry->AddInterface<service_manager::mojom::ServiceFactory>(this);
     return app_client_.OnConnect(remote_info, registry);
   }
 
   // service_manager::InterfaceFactory<service_manager::mojom::ServiceFactory>:
   void Create(const service_manager::Identity& remote_identity,
               service_manager::mojom::ServiceFactoryRequest request) override {
@@ skipping 49 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Package);
 };
 
 }  // namespace
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new Package);
   return runner.Run(service_request_handle);
 }