diff options
| author | ben <ben@chromium.org> | 2015-11-20 15:49:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-20 23:50:00 +0000 |
| commit | a5404b52abc4d9008c0a5e48f7cb9488895462f9 (patch) | |
| tree | ef918922aa163f79349a5dc228729f93ded89ebf /components/mus/ws/window_tree_apptest.cc | |
| parent | be36e8fa623c67c4d46c6be7387f40aad0b7cf0a (diff) | |
| download | chromium_src-a5404b52abc4d9008c0a5e48f7cb9488895462f9.zip chromium_src-a5404b52abc4d9008c0a5e48f7cb9488895462f9.tar.gz chromium_src-a5404b52abc4d9008c0a5e48f7cb9488895462f9.tar.bz2 | |
Convert ConnectToApplication to take a params class
R=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1455833005
Cr-Commit-Position: refs/heads/master@{#360954}
Diffstat (limited to 'components/mus/ws/window_tree_apptest.cc')
| -rw-r--r-- | components/mus/ws/window_tree_apptest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/components/mus/ws/window_tree_apptest.cc b/components/mus/ws/window_tree_apptest.cc index 9f063d0..77755c7 100644 --- a/components/mus/ws/window_tree_apptest.cc +++ b/components/mus/ws/window_tree_apptest.cc @@ -75,12 +75,8 @@ bool EmbedUrl(mojo::ApplicationImpl* app, bool result = false; base::RunLoop run_loop; { - mojo::URLRequestPtr request(mojo::URLRequest::New()); - request->url = mojo::String::From(url); - scoped_ptr<ApplicationConnection> connection = - app->ConnectToApplication(request.Pass()); mojom::WindowTreeClientPtr client; - connection->ConnectToService(&client); + app->ConnectToService(url.get(), &client); ws->Embed(root_id, client.Pass(), mojom::WindowTree::ACCESS_POLICY_DEFAULT, base::Bind(&EmbedCallbackImpl, &run_loop, &result)); } @@ -540,11 +536,9 @@ class WindowTreeAppTest : public mojo::test::ApplicationTestBase, void SetUp() override { ApplicationTestBase::SetUp(); client_factory_.reset(new WindowTreeClientFactory(application_impl())); - mojo::URLRequestPtr request(mojo::URLRequest::New()); - request->url = mojo::String::From("mojo:mus"); mojom::WindowTreeHostFactoryPtr factory; - application_impl()->ConnectToService(request.Pass(), &factory); + application_impl()->ConnectToService("mojo:mus", &factory); mojom::WindowTreeClientPtr tree_client_ptr; ws_client1_.reset(new TestWindowTreeClientImpl(application_impl())); |