Revert of Perform InterfaceProviderSpec intersection in the ServiceManager

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 80 matching lines @@
 
 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,
                            source_info.interface_provider_specs, &source_spec);
-
-  // Acknowledge the request regardless of whether it's accepted.
-  callback.Run();
-
-  CallOnConnect(source_info, source_spec, target_spec, std::move(interfaces));
-}
-
-void ServiceContext::OnBindInterface(
-    const ServiceInfo& source_info,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle interface_pipe,
-    const OnBindInterfaceCallback& callback) {
-  // Acknowledge the request regardless of whether it's accepted.
-  callback.Run();
-
-  mojom::InterfaceProviderPtr interface_provider;
-  // TODO(beng): This should be replaced with a call to OnBindInterface() in a
-  //             subsequent change.
-  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);
-  CallOnConnect(source_info, source_spec, target_spec,
-                MakeRequest(&interface_provider));
-  interface_provider->GetInterface(interface_name, std::move(interface_pipe));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ServiceContext, private:
-
-void ServiceContext::CallOnConnect(const ServiceInfo& source_info,
-                                   const InterfaceProviderSpec& source_spec,
-                                   const InterfaceProviderSpec& target_spec,
-                                   mojom::InterfaceProviderRequest interfaces) {
   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)));
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ServiceContext, private:
+
 void ServiceContext::OnConnectionError() {
   // Note that the Service doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
   service_quit_ = service_->OnStop();
   if (service_quit_) {
     QuitNow();
     // NOTE: This call may delete |this|, so don't access any ServiceContext
     // state beyond this point.
     return;
@@ skipping 14 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