Revise InterfaceRegistry API to support filtering interfaces @ Bind() time.

services/service_manager/public/cpp/interface_registry.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 
 #include <memory>
 #include <queue>
 #include <set>
@@ skipping 58 matching lines @@
     void GetLocalInterface(const std::string& name,
                            mojo::ScopedMessagePipeHandle handle) {
       registry_->GetInterface(name, std::move(handle));
     }
 
    private:
     InterfaceRegistry* registry_;
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  // Construct an InterfaceRegistry with no filtering rules applied.
-  InterfaceRegistry();
-
-  // Construct an InterfaceRegistry in |local_identity| that exposes only
-  // |allowed_interfaces| to |remote_identity|.
-  InterfaceRegistry(const Identity& local_identity,
-                    const Identity& remote_identity,
-                    const InterfaceSet& allowed_interfaces);
+  // Construct an unbound InterfaceRegistry for the service |identity| that
+  // exposes interfaces in accordance to |interface_provider_spec|. This object
+  // will not bind requests for interfaces until Bind() is called.
+  InterfaceRegistry(const Identity& identity,
+                    const InterfaceProviderSpec& interface_provider_spec);
   ~InterfaceRegistry() override;
 
   // Sets a default handler for incoming interface requests which are allowed by
   // capability filters but have no registered handler in this registry.
   void set_default_binder(const Binder& binder) { default_binder_ = binder; }
 
-  void Bind(mojom::InterfaceProviderRequest local_interfaces_request);
+  // Binds a request for an InterfaceProvider from a remote source.
+  // |remote_info| contains the the identity of the remote, and the remote's
+  // InterfaceProviderSpec, which will be intersected with the local's exports
+  // to determine what interfaces may be bound.
+  void Bind(mojom::InterfaceProviderRequest request,
+            const Identity& remote_identity,
+            const InterfaceProviderSpec& remote_interface_provider_spec);
 
   base::WeakPtr<InterfaceRegistry> GetWeakPtr();
 
   // Allows |Interface| to be exposed via this registry. Requests to bind will
   // be handled by |factory|. Returns true if the interface was exposed, false
   // if Connection policy prevented exposure.
   template <typename Interface>
   bool AddInterface(InterfaceFactory<Interface>* factory) {
     return SetInterfaceBinderForName(
         base::MakeUnique<internal::InterfaceFactoryBinder<Interface>>(factory),
@@ skipping 52 matching lines @@
   bool SetInterfaceBinderForName(std::unique_ptr<InterfaceBinder> binder,
                                  const std::string& name);
 
   // Returns true if |remote_identity_| is allowed to bind |interface_name|,
   // according to capability policy.
   bool CanBindRequestForInterface(const std::string& interface_name) const;
 
   mojom::InterfaceProviderRequest pending_request_;
 
   mojo::Binding<mojom::InterfaceProvider> binding_;
-  const Identity local_identity_;
-  const Identity remote_identity_;
-  const InterfaceSet allowed_interfaces_;
-  const bool allow_all_interfaces_;
+  const Identity identity_;
+  const InterfaceProviderSpec interface_provider_spec_;
+
+  // Metadata computed when Bind() is called:
+  Identity remote_identity_;
+  InterfaceSet allowed_interfaces_;
+  bool allow_all_interfaces_ = false;
 
   NameToInterfaceBinderMap name_to_binder_;
   Binder default_binder_;
 
   bool is_paused_ = false;
 
   // Pending interface requests which can accumulate if GetInterface() is called
   // while binding is paused.
   std::queue<std::pair<std::string, mojo::ScopedMessagePipeHandle>>
       pending_interface_requests_;
 
   base::WeakPtrFactory<InterfaceRegistry> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceRegistry);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_