Add frame-specific InterfaceProviderSpec.

services/service_manager/public/cpp/lib/interface_registry.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 "services/service_manager/public/cpp/interface_registry.h"
 
 #include <sstream>
 
 #include "mojo/public/cpp/bindings/message.h"
 #include "services/service_manager/public/cpp/connection.h"
@@ skipping 42 matching lines @@
       for (const auto& interface_name : it->second)
         allowed_interfaces.insert(interface_name);
     }
   }
   return allowed_interfaces;
 }
 
 
 }  // namespace
 
-InterfaceRegistry::InterfaceRegistry(
-    const Identity& identity,
-    const InterfaceProviderSpec& interface_provider_spec)
+InterfaceRegistry::InterfaceRegistry(const std::string& name)
     : binding_(this),
-      identity_(identity),
-      interface_provider_spec_(interface_provider_spec),
+      name_(name),
       weak_factory_(this) {}
-
 InterfaceRegistry::~InterfaceRegistry() {}
 
 void InterfaceRegistry::Bind(
     mojom::InterfaceProviderRequest local_interfaces_request,
+    const Identity& local_identity,
+    const InterfaceProviderSpec& local_interface_provider_spec,
     const Identity& remote_identity,
     const InterfaceProviderSpec& remote_interface_provider_spec) {
   DCHECK(!binding_.is_bound());
+  identity_ = local_identity;
+  interface_provider_spec_ = local_interface_provider_spec;
   remote_identity_ = remote_identity;
   allowed_interfaces_ = GetAllowedInterfaces(remote_interface_provider_spec,
                                              identity_,
                                              interface_provider_spec_);
   allow_all_interfaces_ =
       allowed_interfaces_.size() == 1 && allowed_interfaces_.count("*") == 1;
   if (!allow_all_interfaces_) {
-    for (auto it = name_to_binder_.begin(); it != name_to_binder_.end(); ++it) {
+    for (auto it = name_to_binder_.begin(); it != name_to_binder_.end();) {
       if (allowed_interfaces_.count(it->first) == 0)
-        name_to_binder_.erase(it);
+        it = name_to_binder_.erase(it);
+      else
+        ++it;
     }
   }
   binding_.Bind(std::move(local_interfaces_request));
 }
 
 base::WeakPtr<InterfaceRegistry> InterfaceRegistry::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 bool InterfaceRegistry::AddInterface(
@@ skipping 47 matching lines @@
     return;
   }
 
   auto iter = name_to_binder_.find(interface_name);
   if (iter != name_to_binder_.end()) {
     iter->second->BindInterface(remote_identity_,
                                 interface_name,
                                 std::move(handle));
   } else if (!CanBindRequestForInterface(interface_name)) {
     std::stringstream ss;
-    ss << "Capability spec prevented service " << remote_identity_.name()
-       << " from binding interface: " << interface_name
-       << " exposed by: " << identity_.name();
+    ss << "InterfaceProviderSpec \"" << name_ << "\" prevented service: "
+       << remote_identity_.name() << " from binding interface: "
+       << interface_name << " exposed by: " << identity_.name();
     LOG(ERROR) << ss.str();
     mojo::ReportBadMessage(ss.str());
   } else if (!default_binder_.is_null()) {
     default_binder_.Run(interface_name, std::move(handle));
   } else {
     LOG(ERROR) << "Failed to locate a binder for interface: " << interface_name
                << " requested by: " << remote_identity_.name()
                << " exposed by: " << identity_.name();
   }
 }
@@ skipping 13 matching lines @@
     const std::string& interface_name) const {
   // Any interface may be registered before the registry is bound to a pipe. At
   // bind time, the interfaces exposed will be intersected with the requirements
   // of the source.
   if (!binding_.is_bound())
     return true;
   return allow_all_interfaces_ || allowed_interfaces_.count(interface_name);
 }
 
 }  // namespace service_manager