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

services/service_manager/public/cpp/lib/service_context.cc

 // Copyright 2014 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 "services/service_manager/public/cpp/service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 63 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, mojom::Service implementation:
 
 void ServiceContext::OnStart(const ServiceInfo& info,
                              const OnStartCallback& callback) {
   local_info_ = info;
   callback.Run(std::move(pending_connector_request_),
                mojo::GetProxy(&service_control_, binding_.associated_group()));
-  service_->OnStart(this);
+
+  service_->set_context(this);
+  service_->OnStart();
 }
 
 void ServiceContext::OnConnect(
     const ServiceInfo& source_info,
     mojom::InterfaceProviderRequest interfaces,
     const OnConnectCallback& callback) {
   InterfaceProviderSpec source_spec, target_spec;
   GetInterfaceProviderSpec(mojom::kServiceManager_ConnectorSpec,
                            local_info_.interface_provider_specs, &target_spec);
   GetInterfaceProviderSpec(mojom::kServiceManager_ConnectorSpec,
@@ skipping 47 matching lines @@
 }
 
 void ServiceContext::DestroyConnectionInterfaceRegistry(
     InterfaceRegistry* registry) {
   auto it = connection_interface_registries_.find(registry);
   CHECK(it != connection_interface_registries_.end());
   connection_interface_registries_.erase(it);
 }
 
 }  // namespace service_manager