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

services/service_manager/public/cpp/service_context.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 38 matching lines @@
   // both must be non-null. If both are null, the connection will create its own
   // Connector and request to pass to the Service Manager on initialization.
   ServiceContext(service_manager::Service* service,
                  mojom::ServiceRequest request,
                  std::unique_ptr<Connector> connector = nullptr,
                  mojom::ConnectorRequest connector_request = nullptr);
 
   ~ServiceContext() override;
 
   Connector* connector() { return connector_.get(); }
-  const Identity& identity() { return identity_; }
+  const Identity& identity() { return local_info_.identity; }
 
   // Specify a function to be called when the connection to the service manager
   // is lost.
   // Note that if connection has already been lost, then |closure| is called
   // immediately.
   void SetConnectionLostClosure(const base::Closure& closure);
 
  private:
   // mojom::Service:
   void OnStart(const ServiceInfo& info,
                const OnStartCallback& callback) override;
   void OnConnect(const ServiceInfo& source_info,
-                 mojom::InterfaceProviderRequest interfaces,
-                 const InterfaceSet& allowed_interfaces,
-                 const CapabilitySet& allowed_capabilities) override;
+                 mojom::InterfaceProviderRequest interfaces) override;
 
   void OnConnectionError();
 
   // A callback called when OnStart() is run.
   base::Closure initialize_handler_;
 
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
   std::vector<std::unique_ptr<InterfaceRegistry>> incoming_connections_;
 
   // A pending Connector request which will eventually be passed to the Service
   // Manager.
   mojom::ConnectorRequest pending_connector_request_;
 
   service_manager::Service* service_;
   mojo::Binding<mojom::Service> binding_;
   std::unique_ptr<Connector> connector_;
-  service_manager::Identity identity_;
+  service_manager::ServiceInfo local_info_;
   bool should_run_connection_lost_closure_ = false;
 
   base::Closure connection_lost_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceContext);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_