diff options
| author | ben <ben@chromium.org> | 2015-09-17 19:46:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 02:47:10 +0000 |
| commit | 29dec844330333ee0aacb9beb5cfb58d7ba31d18 (patch) | |
| tree | 1fcc5b6da23548f3e59524cd9266c02c3d2190d1 /mojo/runner/native_runner_unittest.cc | |
| parent | 94d04853543125b5ff421696babb3bf74900a817 (diff) | |
| download | chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.zip chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.gz chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.bz2 | |
Some more minor cleanup to ApplicationManager.
R=yzshen@chromium.org
http://crbug.com/533085
Committed: https://crrev.com/c6bde172a35b65b5a735675e840fab55921d28f8
Cr-Commit-Position: refs/heads/master@{#349515}
Review URL: https://codereview.chromium.org/1351963002
Cr-Commit-Position: refs/heads/master@{#349590}
Diffstat (limited to 'mojo/runner/native_runner_unittest.cc')
| -rw-r--r-- | mojo/runner/native_runner_unittest.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mojo/runner/native_runner_unittest.cc b/mojo/runner/native_runner_unittest.cc index bfb77b8..e4a636d 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); |