Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1065)

Unified Diff: mojo/runner/shell_test_base.cc

Issue 1351443004: Revert of Make CapabilityFilter be part of Identity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/runner/native_runner_unittest.cc ('k') | mojo/shell/application_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/shell_test_base.cc
diff --git a/mojo/runner/shell_test_base.cc b/mojo/runner/shell_test_base.cc
index 07f9d826c1c219e473aac943b84165adba8aefc1..517a6910ceed94bf356b0b7d344538e7a52aa441 100644
--- a/mojo/runner/shell_test_base.cc
+++ b/mojo/runner/shell_test_base.cc
@@ -47,12 +47,14 @@
const GURL& application_url,
const std::string& service_name) {
ServiceProviderPtr services;
+ mojo::URLRequestPtr request(mojo::URLRequest::New());
+ request->url = mojo::String::From(application_url.spec());
scoped_ptr<shell::ConnectToApplicationParams> params(
new shell::ConnectToApplicationParams);
- params->SetTarget(shell::Identity(application_url, std::string(),
- shell::GetPermissiveCapabilityFilter()));
+ params->SetURLInfo(request.Pass());
params->set_services(GetProxy(&services));
+ params->set_filter(shell::GetPermissiveCapabilityFilter());
params->set_on_application_end(base::Bind(&QuitIfRunning));
shell_context_.application_manager()->ConnectToApplication(params.Pass());
MessagePipe pipe;
« no previous file with comments | « mojo/runner/native_runner_unittest.cc ('k') | mojo/shell/application_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698