summaryrefslogtreecommitdiffstats
path: root/mojo/shell/background
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-24 20:14:49 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-25 04:16:46 +0000
commit0a390e6b9f4c6d11ffbd61d0828adc1b2f1aafef (patch)
treefe04a9194e65f573d129aaffbd065c76a2db92bc /mojo/shell/background
parent0c8e440950082a2b7f5eae1410264f75acdd0885 (diff)
downloadchromium_src-0a390e6b9f4c6d11ffbd61d0828adc1b2f1aafef.zip
chromium_src-0a390e6b9f4c6d11ffbd61d0828adc1b2f1aafef.tar.gz
chromium_src-0a390e6b9f4c6d11ffbd61d0828adc1b2f1aafef.tar.bz2
Remove CapabilityFilter from Connect()
It's supplied by the package manifest now so isn't needed for every Connect() call. BTW it's still passed for CreateInstanceForHandle() (can't see a way around that, yet). This disables the CapabilityFilter tests which assume that this works, I need to rewrite all the shell tests now it's completely different. BUG= CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1734643003 Cr-Commit-Position: refs/heads/master@{#377502}
Diffstat (limited to 'mojo/shell/background')
-rw-r--r--mojo/shell/background/background_shell.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc
index 5d8bdc5..3ba1203 100644
--- a/mojo/shell/background/background_shell.cc
+++ b/mojo/shell/background/background_shell.cc
@@ -180,9 +180,7 @@ void BackgroundShell::Init(scoped_ptr<InitParams> init_params) {
mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest(
const GURL& url) {
scoped_ptr<ConnectParams> params(new ConnectParams);
- params->set_target(
- Identity(url, std::string(), mojom::Connector::kUserRoot,
- GetPermissiveCapabilityFilter()));
+ params->set_target(Identity(url, std::string(), mojom::Connector::kUserRoot));
mojom::ShellClientRequest request;
base::WaitableEvent signal(true, false);
thread_->message_loop()->task_runner()->PostTask(