Revert of Capability Classes

mojo/shell/public/cpp/lib/connection_impl.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 "mojo/shell/public/cpp/lib/connection_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/interface_binder.h"
 
 namespace mojo {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConnectionImpl, public:
 
 ConnectionImpl::ConnectionImpl(
     const std::string& connection_name,
     const Identity& remote,
     uint32_t remote_id,
     shell::mojom::InterfaceProviderPtr remote_interfaces,
     shell::mojom::InterfaceProviderRequest local_interfaces,
-    const CapabilityRequest& capability_request,
+    const std::set<std::string>& allowed_interfaces,
     State initial_state)
     : connection_name_(connection_name),
       remote_(remote),
       remote_id_(remote_id),
       state_(initial_state),
       local_registry_(std::move(local_interfaces), this),
       remote_interfaces_(std::move(remote_interfaces)),
-      capability_request_(capability_request),
-      allow_all_interfaces_(capability_request.interfaces.size() == 1 &&
-                            capability_request.interfaces.count("*") == 1),
+      allowed_interfaces_(allowed_interfaces),
+      allow_all_interfaces_(allowed_interfaces_.size() == 1 &&
+                            allowed_interfaces_.count("*") == 1),
       weak_factory_(this) {}
 
 ConnectionImpl::ConnectionImpl()
     : local_registry_(shell::mojom::InterfaceProviderRequest(), this),
       allow_all_interfaces_(true),
       weak_factory_(this) {}
 
 ConnectionImpl::~ConnectionImpl() {}
 
 shell::mojom::Connector::ConnectCallback ConnectionImpl::GetConnectCallback() {
   return base::Bind(&ConnectionImpl::OnConnectionCompleted,
                     weak_factory_.GetWeakPtr());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConnectionImpl, Connection implementation:
 
-bool ConnectionImpl::HasCapabilityClass(const std::string& class_name) const {
-  return capability_request_.classes.count(class_name) > 0;
-}
-
 const std::string& ConnectionImpl::GetConnectionName() {
   return connection_name_;
 }
 
 const Identity& ConnectionImpl::GetRemoteIdentity() const {
   return remote_;
 }
 
 void ConnectionImpl::SetConnectionLostClosure(const Closure& handler) {
   remote_interfaces_.set_connection_error_handler(handler);
@@ skipping 12 matching lines @@
 }
 
 void ConnectionImpl::AddConnectionCompletedClosure(const Closure& callback) {
   if (IsPending())
     connection_completed_callbacks_.push_back(callback);
   else
     callback.Run();
 }
 
 bool ConnectionImpl::AllowsInterface(const std::string& interface_name) const {
-  return allow_all_interfaces_ ||
-         capability_request_.interfaces.count(interface_name);
+  return allow_all_interfaces_ || allowed_interfaces_.count(interface_name);
 }
 
 shell::mojom::InterfaceProvider* ConnectionImpl::GetRemoteInterfaces() {
   return remote_interfaces_.get();
 }
 
 InterfaceRegistry* ConnectionImpl::GetLocalRegistry() {
   return &local_registry_;
 }
 
@@ skipping 15 matching lines @@
   remote_id_ = target_application_id;
   remote_.set_user_id(target_user_id);
   std::vector<Closure> callbacks;
   callbacks.swap(connection_completed_callbacks_);
   for (auto callback : callbacks)
     callback.Run();
 }
 
 }  // namespace internal
 }  // namespace mojo