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

services/service_manager/tests/connect/connect_test_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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 36 matching lines @@
         title_(title),
         request_(std::move(request)) {
     Start();
   }
 
   ~ProvidedService() override {
     Join();
   }
 
  private:
+  class ForwardingServiceImpl : public Service {
+   public:
+    explicit ForwardingServiceImpl(Service* service)
+        : service_(service) {}
+    ~ForwardingServiceImpl() override {}
+
+    // Service:
+    void OnStart(ServiceContext* context) override {
+      service_->OnStart(context);
+    }
+
+    bool OnConnect(const ServiceInfo& remote_info,
+                   InterfaceRegistry* registry) override {
+      return service_->OnConnect(remote_info, registry);
+    }
+
+    bool OnStop() override { return service_->OnStop(); }
+
+   private:
+    Service* const service_;
+
+    DISALLOW_COPY_AND_ASSIGN(ForwardingServiceImpl);
+  };
+
   // service_manager::Service:
-  void OnStart() override {
+  void OnStart(ServiceContext* context) override {
+    context_ = context;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedService::OnConnectionError,
                    base::Unretained(this)));
   }
 
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     registry->AddInterface<test::mojom::BlockedInterface>(this);
     registry->AddInterface<test::mojom::UserIdTest>(this);
 
     test::mojom::ConnectionStatePtr state(test::mojom::ConnectionState::New());
     state->connection_remote_name = remote_info.identity.name();
     state->connection_remote_userid = remote_info.identity.user_id();
-    state->initialize_local_name = context()->identity().name();
-    state->initialize_userid = context()->identity().user_id();
+    state->initialize_local_name = context_->identity().name();
+    state->initialize_userid = context_->identity().user_id();
 
-    context()->connector()->ConnectToInterface(remote_info.identity, &caller_);
+    context_->connector()->ConnectToInterface(remote_info.identity, &caller_);
     caller_->ConnectionAccepted(std::move(state));
 
     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::BlockedInterface>:
   void Create(const Identity& remote_identity,
               test::mojom::BlockedInterfaceRequest request) override {
     blocked_bindings_.AddBinding(this, std::move(request));
   }
 
   // InterfaceFactory<test::mojom::UserIdTest>:
   void Create(const Identity& remote_identity,
               test::mojom::UserIdTestRequest request) override {
     user_id_test_bindings_.AddBinding(this, std::move(request));
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run(title_);
   }
 
   void GetInstance(const GetInstanceCallback& callback) override {
-    callback.Run(context()->identity().instance());
+    callback.Run(context_->identity().instance());
   }
 
   // test::mojom::BlockedInterface:
   void GetTitleBlocked(const GetTitleBlockedCallback& callback) override {
     callback.Run("Called Blocked Interface!");
   }
 
   // test::mojom::UserIdTest:
   void ConnectToClassAppAsDifferentUser(
       const service_manager::Identity& target,
       const ConnectToClassAppAsDifferentUserCallback& callback) override {
     Connector::ConnectParams params(target);
     std::unique_ptr<Connection> connection =
-        context()->connector()->Connect(&params);
+        context_->connector()->Connect(&params);
     {
       base::RunLoop loop;
       connection->AddConnectionCompletedClosure(loop.QuitClosure());
       base::MessageLoop::ScopedNestableTaskAllower allow(
           base::MessageLoop::current());
       loop.Run();
     }
     callback.Run(static_cast<int32_t>(connection->GetResult()),
                  connection->GetRemoteIdentity());
   }
 
   // base::SimpleThread:
   void Run() override {
-    ServiceRunner(new ForwardingService(this)).Run(
+    ServiceRunner(new ForwardingServiceImpl(this)).Run(
         request_.PassMessagePipe().release().value(), false);
     caller_.reset();
     bindings_.CloseAllBindings();
     blocked_bindings_.CloseAllBindings();
     user_id_test_bindings_.CloseAllBindings();
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
+  ServiceContext* context_ = nullptr;
   const std::string title_;
   mojom::ServiceRequest request_;
   test::mojom::ExposedInterfacePtr caller_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   mojo::BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
   mojo::BindingSet<test::mojom::UserIdTest> user_id_test_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedService);
 };
 
 class ConnectTestService
     : public Service,
       public InterfaceFactory<mojom::ServiceFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ServiceFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestService() {}
   ~ConnectTestService() override {}
 
  private:
   // service_manager::Service:
-  void OnStart() override {
+  void OnStart(ServiceContext* context) override {
+    context_ = context;
+
     base::Closure error_handler =
         base::Bind(&ConnectTestService::OnConnectionError,
                    base::Unretained(this));
     bindings_.set_connection_error_handler(error_handler);
     service_factory_bindings_.set_connection_error_handler(error_handler);
   }
 
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<ServiceFactory>(this);
@@ skipping 29 matching lines @@
           base::MakeUnique<ProvidedService>("B", std::move(request)));
     }
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run("ROOT");
   }
 
   void GetInstance(const GetInstanceCallback& callback) override {
-    callback.Run(context()->identity().instance());
+    callback.Run(context_->identity().instance());
   }
 
   void OnConnectionError() {
     if (bindings_.empty() && service_factory_bindings_.empty())
-      context()->RequestQuit();
+      context_->RequestQuit();
   }
 
+  ServiceContext* context_ = nullptr;
   std::vector<std::unique_ptr<Service>> delegates_;
   mojo::BindingSet<mojom::ServiceFactory> service_factory_bindings_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   std::list<std::unique_ptr<ProvidedService>> provided_services_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestService);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(
       new service_manager::ConnectTestService);
   return runner.Run(service_request_handle);
 }