Revert of Capability Classes

mojo/shell/public/cpp/lib/connector_impl.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 "mojo/shell/public/cpp/lib/connector_impl.h"
 
 #include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/cpp/lib/connection_impl.h"
 
 namespace mojo {
@@ skipping 31 matching lines @@
     thread_checker_.reset(new base::ThreadChecker);
   }
   DCHECK(thread_checker_->CalledOnValidThread());
 
   DCHECK(params);
   // We allow all interfaces on outgoing connections since we are presumably in
   // a position to know who we're talking to.
   // TODO(beng): We should filter outgoing interfaces also. The shell must pass
   //             the manifest CapabilityFilter to the ShellConnection via
   //             Initialize(), it can be used here.
-  CapabilityRequest request;
-  request.interfaces.insert("*");
+  std::set<std::string> allowed;
+  allowed.insert("*");
   shell::mojom::InterfaceProviderPtr local_interfaces;
   shell::mojom::InterfaceProviderRequest local_request =
       GetProxy(&local_interfaces);
   shell::mojom::InterfaceProviderPtr remote_interfaces;
   shell::mojom::InterfaceProviderRequest remote_request =
       GetProxy(&remote_interfaces);
   scoped_ptr<internal::ConnectionImpl> registry(new internal::ConnectionImpl(
       params->target().name(), params->target(),
       shell::mojom::kInvalidInstanceID, std::move(remote_interfaces),
-      std::move(local_request), request, Connection::State::PENDING));
+      std::move(local_request), allowed, Connection::State::PENDING));
 
   shell::mojom::ShellClientFactoryPtr shell_client_factory;
   shell::mojom::PIDReceiverRequest pid_receiver_request;
   params->TakeClientProcessConnection(&shell_client_factory,
                                       &pid_receiver_request);
   shell::mojom::ClientProcessConnectionPtr client_process_connection;
   if (shell_client_factory.is_bound() && pid_receiver_request.is_pending()) {
     client_process_connection = shell::mojom::ClientProcessConnection::New();
     client_process_connection->shell_client_factory =
         shell_client_factory.PassInterface().PassHandle();
@@ skipping 13 matching lines @@
 }
 
 scoped_ptr<Connector> ConnectorImpl::Clone() {
   shell::mojom::ConnectorPtr connector;
   connector_->Clone(GetProxy(&connector));
   return make_scoped_ptr(
       new ConnectorImpl(connector.PassInterface()));
 }
 
 }  // namespace mojo