Change signature of OnConnect

services/shell/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_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 #define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 
 #include <memory>
 #include <queue>
 #include <set>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "services/shell/public/cpp/capabilities.h"
+#include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/cpp/lib/callback_binder.h"
 #include "services/shell/public/cpp/lib/interface_factory_binder.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace shell {
 class Connection;
 class InterfaceBinder;
 
 // An implementation of mojom::InterfaceProvider that allows the user to
 // register services to be exposed to another application.
@@ skipping 31 matching lines @@
                                    const std::string& interface_name) {
       registry_->SetInterfaceBinderForName(
           base::WrapUnique(binder), interface_name);
     }
 
    private:
     InterfaceRegistry* registry_;
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  // Construct with a Connection (which may be null), and create an
-  // InterfaceProvider pipe, the client end of which may be obtained by calling
-  // TakeClientHandle(). If |connection| is non-null, the Mojo Shell's
-  // rules filtering which interfaces are allowed to be exposed to clients are
-  // imposed on this registry. If null, they are not.
-  explicit InterfaceRegistry(Connection* connection);
+  // Construct an InterfaceRegistry with no filtering rules applied.
+  InterfaceRegistry();
+
+  // Construct an InterfaceRegistry with filtering rules as specified in
+  // |capability_request| applied.
+  InterfaceRegistry(const Identity& remote_identity,
+                    const CapabilityRequest& capability_request);
   ~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);
 
   base::WeakPtr<InterfaceRegistry> GetWeakPtr();
 
@@ skipping 53 matching lines @@
 
   // mojom::InterfaceProvider:
   void GetInterface(const mojo::String& interface_name,
                     mojo::ScopedMessagePipeHandle handle) override;
 
   // Returns true if the binder was set, false if it was not set (e.g. by
   // some filtering policy preventing this interface from being exposed).
   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_;
-  Connection* connection_;
+  const Identity remote_identity_;
+  const CapabilityRequest capability_request_;
+  const bool allow_all_interfaces_;
 
   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<mojo::String, mojo::ScopedMessagePipeHandle>>
       pending_interface_requests_;
 
   base::WeakPtrFactory<InterfaceRegistry> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceRegistry);
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_