Remove CapabilityFilter from Connect()

mojo/shell/application_instance.cc

 // Copyright 2015 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/application_instance.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/capability_filter.h"
 
 namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
     mojom::ShellClientPtr shell_client,
     ApplicationManager* manager,
     const Identity& identity)
     : manager_(manager),
       id_(GenerateUniqueID()),
@@ skipping 50 matching lines @@
       base::Bind(&ApplicationInstance::OnQuitRequestedResult,
                  base::Unretained(this)));
 }
 
 // Connector implementation:
 void ApplicationInstance::Connect(
     const String& app_url,
     uint32_t user_id,
     shell::mojom::InterfaceProviderRequest remote_interfaces,
     shell::mojom::InterfaceProviderPtr local_interfaces,
-    mojom::CapabilityFilterPtr filter,
     const ConnectCallback& callback) {
   GURL url = app_url.To<GURL>();
   if (!url.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << app_url;
     callback.Run(kInvalidApplicationID);
     return;
   }
   if (allow_any_application_ ||
       identity_.filter().find(url.spec()) != identity_.filter().end()) {
-    CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
-    if (!filter.is_null())
-      capability_filter = filter->filter.To<CapabilityFilter>();
-
     scoped_ptr<ConnectParams> params(new ConnectParams);
     params->set_source(identity_);
-    params->set_target(
-        Identity(url, std::string(), user_id, capability_filter));
+    params->set_target(Identity(url, std::string(), user_id));
     params->set_remote_interfaces(std::move(remote_interfaces));
     params->set_local_interfaces(std::move(local_interfaces));
     params->set_connect_callback(callback);
     manager_->Connect(std::move(params));
   } else {
     LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
         identity_.url() << " to: " << url.spec();
     callback.Run(kInvalidApplicationID);
   }
 }
@@ skipping 50 matching lines @@
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo