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

services/service_manager/tests/connect/connect_test_class_app.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 "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
@@ skipping 15 matching lines @@
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public InterfaceFactory<test::mojom::ClassInterface>,
       public test::mojom::ConnectTestService,
       public test::mojom::ClassInterface {
  public:
   ConnectTestClassApp() {}
   ~ConnectTestClassApp() override {}
 
  private:
   // service_manager::Service:
+  void OnStart(ServiceContext* context) override {
+    context_ = context;
+  }
+
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     registry->AddInterface<test::mojom::ClassInterface>(this);
     inbound_connections_.insert(registry);
     registry->AddConnectionLostClosure(
         base::Bind(&ConnectTestClassApp::OnConnectionError,
                    base::Unretained(this), registry));
     return true;
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(const Identity& remote_identity,
               test::mojom::ConnectTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // InterfaceFactory<test::mojom::ClassInterface>:
   void Create(const Identity& remote_identity,
               test::mojom::ClassInterfaceRequest request) override {
     class_interface_bindings_.AddBinding(this, std::move(request));
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run("CLASS APP");
   }
   void GetInstance(const GetInstanceCallback& callback) override {
-    callback.Run(context()->identity().instance());
+    callback.Run(context_->identity().instance());
   }
 
   // test::mojom::ClassInterface:
   void Ping(const PingCallback& callback) override {
     callback.Run("PONG");
   }
 
   void OnConnectionError(InterfaceRegistry* registry) {
     auto it = inbound_connections_.find(registry);
     DCHECK(it != inbound_connections_.end());
     inbound_connections_.erase(it);
     if (inbound_connections_.empty())
-      context()->QuitNow();
+      context_->QuitNow();
   }
 
+  ServiceContext* context_ = nullptr;
   std::set<InterfaceRegistry*> inbound_connections_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   mojo::BindingSet<test::mojom::ClassInterface> class_interface_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestClassApp);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(
       new service_manager::ConnectTestClassApp);
   return runner.Run(service_request_handle);
 }