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

Unified Diff: mojo/shell/capability_filter_unittest.cc

Issue 1351963002: 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/shell/application_manager_unittest.cc ('k') | mojo/shell/connect_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/capability_filter_unittest.cc
diff --git a/mojo/shell/capability_filter_unittest.cc b/mojo/shell/capability_filter_unittest.cc
index 0c33a8fbadc076c5c94cc4e40aa14a79e6e05bbf..1dbc35b168a3e31608f9647291ea154477fe35b6 100644
--- a/mojo/shell/capability_filter_unittest.cc
+++ b/mojo/shell/capability_filter_unittest.cc
@@ -343,10 +343,15 @@ class CapabilityFilterTest : public testing::Test {
AddService<Validator>(validator_);
URLRequestPtr request(URLRequest::New());
request->url = String::From(url);
- application_manager_->ConnectToApplication(
- nullptr, request.Pass(), std::string(), GetProxy(&services),
- exposed_services.Pass(), filter,
- base::MessageLoop::QuitWhenIdleClosure(), EmptyConnectCallback());
+
+ scoped_ptr<ConnectToApplicationParams> params(
+ new ConnectToApplicationParams);
+ params->SetURLInfo(request.Pass());
+ params->set_services(GetProxy(&services));
+ params->set_exposed_services(exposed_services.Pass());
+ params->set_filter(filter);
+ params->set_on_application_end(base::MessageLoop::QuitWhenIdleClosure());
+ application_manager_->ConnectToApplication(params.Pass());
}
void InitValidator(const std::set<std::string>& expectations) {
« no previous file with comments | « mojo/shell/application_manager_unittest.cc ('k') | mojo/shell/connect_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698