Revert of Service Manager: Implement graceful service termination

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 33 matching lines @@
 
 ServiceContext::~ServiceContext() {}
 
 void ServiceContext::SetConnectionLostClosure(const base::Closure& closure) {
   connection_lost_closure_ = closure;
   if (service_quit_)
     QuitNow();
 }
 
 void ServiceContext::RequestQuit() {
-  DCHECK(service_control_.is_bound());
-  service_control_->RequestQuit();
+  // TODO(rockot): Implement this.
 }
 
 void ServiceContext::DisconnectFromServiceManager() {
   if (binding_.is_bound())
     binding_.Close();
   connector_.reset();
 }
 
 void ServiceContext::QuitNow() {
   if (binding_.is_bound())
     binding_.Close();
   if (!connection_lost_closure_.is_null())
     base::ResetAndReturn(&connection_lost_closure_).Run();
 }
 
 void ServiceContext::DestroyService() {
   QuitNow();
   service_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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()));
+  callback.Run(std::move(pending_connector_request_));
   service_->OnStart(this);
 }
 
 void ServiceContext::OnConnect(
     const ServiceInfo& source_info,
-    mojom::InterfaceProviderRequest interfaces,
-    const OnConnectCallback& callback) {
+    mojom::InterfaceProviderRequest interfaces) {
   InterfaceProviderSpec source_spec, target_spec;
   GetInterfaceProviderSpec(mojom::kServiceManager_ConnectorSpec,
                            local_info_.interface_provider_specs, &target_spec);
   GetInterfaceProviderSpec(mojom::kServiceManager_ConnectorSpec,
                            source_info.interface_provider_specs, &source_spec);
   auto registry =
       base::MakeUnique<InterfaceRegistry>(mojom::kServiceManager_ConnectorSpec);
   registry->Bind(std::move(interfaces), local_info_.identity, target_spec,
                  source_info.identity, source_spec);
 
-  // Acknowledge the request regardless of whether it's accepted.
-  callback.Run();
-
   if (!service_->OnConnect(source_info, registry.get()))
     return;
 
   InterfaceRegistry* raw_registry = registry.get();
   registry->AddConnectionLostClosure(base::Bind(
       &ServiceContext::OnRegistryConnectionError, base::Unretained(this),
       raw_registry));
   connection_interface_registries_.insert(
       std::make_pair(raw_registry, std::move(registry)));
 }
@@ skipping 28 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