Add frame-specific InterfaceProviderSpec.

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 "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
@@ skipping 45 matching lines @@
     initialize_handler_.Run();
 
   callback.Run(std::move(pending_connector_request_));
 
   service_->OnStart(info);
 }
 
 void ServiceContext::OnConnect(
     const ServiceInfo& source_info,
     mojom::InterfaceProviderRequest interfaces) {
-  auto target_it = local_info_.interface_provider_specs.find(
-      mojom::kServiceManager_ConnectorSpec);
-  InterfaceProviderSpec target_spec;
-  if (target_it != local_info_.interface_provider_specs.end())
-    target_spec = target_it->second;
-  auto source_it = source_info.interface_provider_specs.find(
-      mojom::kServiceManager_ConnectorSpec);
-  InterfaceProviderSpec source_spec;
-  if (source_it != source_info.interface_provider_specs.end())
-    source_spec = source_it->second;
-
-  auto registry = base::MakeUnique<InterfaceRegistry>(local_info_.identity,
-                                                      target_spec);
-  registry->Bind(std::move(interfaces), source_info.identity, source_spec);
+  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>();
+  registry->Bind(std::move(interfaces), local_info_.identity, target_spec,
+                 source_info.identity, source_spec);
 
   if (!service_->OnConnect(source_info, registry.get()))
     return;
 
   // TODO(beng): it appears we never prune this list. We should, when the
   //             registry's remote interface provider pipe breaks.
   incoming_connections_.push_back(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.
   should_run_connection_lost_closure_ = service_->OnStop();
   if (should_run_connection_lost_closure_ &&
       !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.
 }
 
 }  // namespace service_manager