diff options
author | ben <ben@chromium.org> | 2016-02-07 12:31:19 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-07 20:32:20 +0000 |
commit | c08c4c008d30f1e4965fbdf39ce941a0661cce43 (patch) | |
tree | 623c075c0473d2cf87f1aee2c61a32e171eb5443 /components/mus/ws | |
parent | de90347d8ad768372264265e1351d85159d54a55 (diff) | |
download | chromium_src-c08c4c008d30f1e4965fbdf39ce941a0661cce43.zip chromium_src-c08c4c008d30f1e4965fbdf39ce941a0661cce43.tar.gz chromium_src-c08c4c008d30f1e4965fbdf39ce941a0661cce43.tar.bz2 |
Rename ConnectToApplication to Connect().
TBR=rockot@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1673983002
Cr-Commit-Position: refs/heads/master@{#374066}
Diffstat (limited to 'components/mus/ws')
-rw-r--r-- | components/mus/ws/window_manager_client_apptest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/mus/ws/window_manager_client_apptest.cc b/components/mus/ws/window_manager_client_apptest.cc index 34d42fb..8d174d7 100644 --- a/components/mus/ws/window_manager_client_apptest.cc +++ b/components/mus/ws/window_manager_client_apptest.cc @@ -258,7 +258,7 @@ class WindowServerTest : public WindowServerTestBase { EmbedResult Embed(Window* window, uint32_t access_policy_bitmask) { DCHECK(!embed_details_); embed_details_.reset(new EmbedDetails); - window->Embed(ConnectToApplicationAndGetWindowServerClient(), + window->Embed(ConnectAndGetWindowServerClient(), access_policy_bitmask, base::Bind(&WindowServerTest::EmbedCallbackImpl, base::Unretained(this))); @@ -273,8 +273,7 @@ class WindowServerTest : public WindowServerTestBase { // Establishes a connection to this application and asks for a // WindowTreeClient. - mus::mojom::WindowTreeClientPtr - ConnectToApplicationAndGetWindowServerClient() { + mus::mojom::WindowTreeClientPtr ConnectAndGetWindowServerClient() { mus::mojom::WindowTreeClientPtr client; shell()->ConnectToService(shell_url(), &client); return client; @@ -974,7 +973,7 @@ TEST_F(WindowServerTest, EmbedRemovesChildren) { window1->AddChild(window2); WindowRemovedFromParentObserver observer(window2); - window1->Embed(ConnectToApplicationAndGetWindowServerClient()); + window1->Embed(ConnectAndGetWindowServerClient()); EXPECT_TRUE(observer.was_removed()); EXPECT_EQ(nullptr, window2->parent()); EXPECT_TRUE(window1->children().empty()); |