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

Unified Diff: mojo/runner/native_runner_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/runner/context.cc ('k') | mojo/runner/shell_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/native_runner_unittest.cc
diff --git a/mojo/runner/native_runner_unittest.cc b/mojo/runner/native_runner_unittest.cc
index bfb77b840b4e5954758129c0a4fb944455c0a673..e4a636d7b246bed0f616945dfca3de61ab61e429 100644
--- a/mojo/runner/native_runner_unittest.cc
+++ b/mojo/runner/native_runner_unittest.cc
@@ -94,10 +94,14 @@ TEST_F(NativeApplicationLoaderTest, DoesNotExist) {
ServiceProviderPtr service_provider;
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url.spec());
- context_->application_manager()->ConnectToApplication(
- nullptr, request.Pass(), std::string(), services.Pass(),
- service_provider.Pass(), shell::GetPermissiveCapabilityFilter(),
- base::Closure(), shell::EmptyConnectCallback());
+
+ scoped_ptr<shell::ConnectToApplicationParams> params(
+ new shell::ConnectToApplicationParams);
+ params->SetURLInfo(request.Pass());
+ params->set_services(services.Pass());
+ params->set_exposed_services(service_provider.Pass());
+ params->set_filter(shell::GetPermissiveCapabilityFilter());
+ context_->application_manager()->ConnectToApplication(params.Pass());
EXPECT_FALSE(state_.runner_was_created);
EXPECT_FALSE(state_.runner_was_started);
EXPECT_FALSE(state_.runner_was_destroyed);
« no previous file with comments | « mojo/runner/context.cc ('k') | mojo/runner/shell_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698