| Index: ash/mus/window_manager_unittest.cc
|
| diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
|
| index d084d1d24822ed9c2eef091d9d4e937f2eb642c4..dfe236b90a374b271f5debcdf8e59e52459fc151 100644
|
| --- a/ash/mus/window_manager_unittest.cc
|
| +++ b/ash/mus/window_manager_unittest.cc
|
| @@ -20,16 +20,16 @@
|
| namespace ash {
|
| namespace mus {
|
|
|
| -class WindowTreeClientDelegate : public ::ui::WindowTreeClientDelegate {
|
| +class WindowTreeClientDelegate : public ui::WindowTreeClientDelegate {
|
| public:
|
| WindowTreeClientDelegate() {}
|
| ~WindowTreeClientDelegate() override {}
|
|
|
| private:
|
| // ui::WindowTreeClientDelegate:
|
| - void OnEmbed(::ui::Window* root) override {}
|
| - void OnDidDestroyClient(::ui::WindowTreeClient* client) override {}
|
| - void OnEventObserved(const ui::Event& event, ::ui::Window* target) override {}
|
| + void OnEmbed(ui::Window* root) override {}
|
| + void OnDidDestroyClient(ui::WindowTreeClient* client) override {}
|
| + void OnEventObserved(const ui::Event& event, ui::Window* target) override {}
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate);
|
| };
|
| @@ -117,23 +117,22 @@ TEST_F(WindowManagerTest, OpenWindow) {
|
|
|
| // Connect to mus and create a new top level window. The request goes to
|
| // |ash|, but is async.
|
| - std::unique_ptr<::ui::WindowTreeClient> client(
|
| - new ::ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
|
| + std::unique_ptr<ui::WindowTreeClient> client(
|
| + new ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
|
| client->ConnectViaWindowTreeFactory(connector());
|
| - ::ui::Window* top_level_window = client->NewTopLevelWindow(nullptr);
|
| + ui::Window* top_level_window = client->NewTopLevelWindow(nullptr);
|
| ASSERT_TRUE(top_level_window);
|
| - ::ui::Window* child_window = client->NewWindow();
|
| + ui::Window* child_window = client->NewWindow();
|
| ASSERT_TRUE(child_window);
|
| top_level_window->AddChild(child_window);
|
|
|
| // Create another WindowTreeClient by way of embedding in
|
| // |child_window|. This blocks until it succeeds.
|
| - ::ui::mojom::WindowTreeClientPtr tree_client;
|
| + ui::mojom::WindowTreeClientPtr tree_client;
|
| auto tree_client_request = GetProxy(&tree_client);
|
| child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed));
|
| - std::unique_ptr<::ui::WindowTreeClient> child_client(
|
| - new ::ui::WindowTreeClient(&window_tree_delegate, nullptr,
|
| - std::move(tree_client_request)));
|
| + std::unique_ptr<ui::WindowTreeClient> child_client(new ui::WindowTreeClient(
|
| + &window_tree_delegate, nullptr, std::move(tree_client_request)));
|
| child_client->WaitForEmbed();
|
| ASSERT_TRUE(!child_client->GetRoots().empty());
|
| }
|
| @@ -145,10 +144,10 @@ TEST_F(WindowManagerTest, OpenWindowAndClose) {
|
|
|
| // Connect to mus and create a new top level window.
|
| WindowTreeClientDelegate window_tree_delegate;
|
| - std::unique_ptr<::ui::WindowTreeClient> client(
|
| - new ::ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
|
| + std::unique_ptr<ui::WindowTreeClient> client(
|
| + new ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr));
|
| client->ConnectViaWindowTreeFactory(connector());
|
| - ::ui::Window* top_level_window = client->NewTopLevelWindow(nullptr);
|
| + ui::Window* top_level_window = client->NewTopLevelWindow(nullptr);
|
| ASSERT_TRUE(top_level_window);
|
|
|
| observer.WaitUntilWindowCountReaches(1u);
|
|
|