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

Unified Diff: mojo/runner/shell_test_base.cc

Issue 1354043002: Revert of Some more minor cleanup to ApplicationManager. (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/BUILD.gn » ('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 517a6910ceed94bf356b0b7d344538e7a52aa441..8731720b6cb5ad61bc67c677de64c690c36a0e94 100644
--- a/mojo/runner/shell_test_base.cc
+++ b/mojo/runner/shell_test_base.cc
@@ -49,14 +49,10 @@
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->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());
+ shell_context_.application_manager()->ConnectToApplication(
+ nullptr, request.Pass(), std::string(), GetProxy(&services), nullptr,
+ shell::GetPermissiveCapabilityFilter(), base::Bind(&QuitIfRunning),
+ shell::EmptyConnectCallback());
MessagePipe pipe;
services->ConnectToService(service_name, pipe.handle1.Pass());
return pipe.handle0.Pass();
« no previous file with comments | « mojo/runner/native_runner_unittest.cc ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698