Converts WindowTreeClientTest to be in terms of aura

services/ui/ws/window_server_test_base.cc

Index: services/ui/ws/window_server_test_base.cc
diff --git a/services/ui/ws/window_server_test_base.cc b/services/ui/ws/window_server_test_base.cc
new file mode 100644
index 0000000000000000000000000000000000000000..95996a38eda245fc901a375463bf8c649aeefb58
--- /dev/null
+++ b/services/ui/ws/window_server_test_base.cc
@@ -0,0 +1,279 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "services/ui/ws/window_server_test_base.h"
+
+#include "base/bind.h"
+#include "base/location.h"
+#include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
+#include "base/test/test_timeouts.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/ui/public/cpp/gpu/gpu_service.h"
+#include "ui/aura/env.h"
+#include "ui/aura/mus/mus_context_factory.h"
+#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/mus/window_tree_host_mus.h"
+#include "ui/display/display.h"
+#include "ui/display/display_list.h"
+#include "ui/wm/core/capture_controller.h"
+
+namespace ui {
+namespace {
+
+base::RunLoop* current_run_loop = nullptr;
+
+void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) {
+  CHECK(current_run_loop);
+  *timeout = true;
+  timeout_task.Run();
+}
+
+}  // namespace
+
+WindowServerTestBase::WindowServerTestBase() {}
+
+WindowServerTestBase::~WindowServerTestBase() {
+  display::Screen::SetScreenInstance(nullptr);

[msw, 2016/12/08 01:20:11]

Is this needed here and in TearDown? Ditto for window_tree_clients_.clear();

[sky, 2016/12/08 04:59:45]

Nope. Done.

+  window_tree_clients_.clear();
+}
+
+// static
+bool WindowServerTestBase::DoRunLoopWithTimeout() {
+  if (current_run_loop != nullptr)
+    return false;
+
+  bool timeout = false;
+  base::RunLoop run_loop;
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE, base::Bind(&TimeoutRunLoop, run_loop.QuitClosure(), &timeout),
+      TestTimeouts::action_timeout());
+
+  current_run_loop = &run_loop;
+  current_run_loop->Run();
+  current_run_loop = nullptr;
+  return !timeout;
+}
+
+// static
+bool WindowServerTestBase::QuitRunLoop() {
+  if (!current_run_loop)
+    return false;
+
+  current_run_loop->Quit();
+  current_run_loop = nullptr;
+  return true;
+}
+
+void WindowServerTestBase::DeleteWindowTreeClient(
+    aura::WindowTreeClient* client) {
+  for (auto iter = window_tree_clients_.begin();
+       iter != window_tree_clients_.end(); ++iter) {
+    if (iter->get() == client) {
+      window_tree_clients_.erase(iter);
+      return;
+    }
+  }
+  NOTREACHED();
+}
+
+std::unique_ptr<aura::WindowTreeClient>
+WindowServerTestBase::ReleaseMostRecentClient() {
+  if (window_tree_clients_.empty())
+    return nullptr;
+
+  std::unique_ptr<aura::WindowTreeClient> result =
+      std::move(window_tree_clients_.back());
+  window_tree_clients_.pop_back();
+  return result;
+}
+
+void WindowServerTestBase::SetUp() {
+  WindowServerServiceTestBase::SetUp();
+
+  env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS);
+  gpu_service_ = ui::GpuService::Create(connector(), nullptr);
+  compositor_context_factory_ =
+      base::MakeUnique<aura::MusContextFactory>(gpu_service_.get());
+  env_->set_context_factory(compositor_context_factory_.get());
+  display::Screen::SetScreenInstance(&screen_);
+  std::unique_ptr<aura::WindowTreeClient> window_manager_window_tree_client =
+      base::MakeUnique<aura::WindowTreeClient>(connector(), this, this);
+  window_manager_window_tree_client->ConnectAsWindowManager();
+  window_manager_ = window_manager_window_tree_client.get();
+  window_tree_clients_.push_back(std::move(window_manager_window_tree_client));
+
+  ASSERT_TRUE(DoRunLoopWithTimeout());  // RunLoop should be quit by OnEmbed().

[msw, 2016/12/08 01:20:11]

nit: maybe explain why OnEmbed is called? (eg. it's embedding
|window_manager_window_tree_client|?)

[sky, 2016/12/08 04:59:45]

Done.

+}
+
+void WindowServerTestBase::TearDown() {
+  // WindowTreeHost depends on WindowTreeClient.
+  window_tree_hosts_.clear();
+  window_tree_clients_.clear();
+  env_.reset();
+  gpu_service_.reset();
+  display::Screen::SetScreenInstance(nullptr);
+
+  WindowServerServiceTestBase::TearDown();
+}
+
+bool WindowServerTestBase::OnConnect(
+    const service_manager::Identity& remote_identity,
+    service_manager::InterfaceRegistry* registry) {
+  registry->AddInterface<mojom::WindowTreeClient>(this);
+  return true;
+}
+
+void WindowServerTestBase::OnEmbed(
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+  EXPECT_TRUE(QuitRunLoop());
+  window_tree_hosts_.push_back(std::move(window_tree_host));
+}
+
+void WindowServerTestBase::OnLostConnection(aura::WindowTreeClient* client) {
+  window_tree_client_lost_connection_ = true;
+  DeleteWindowTreeClient(client);
+}
+
+void WindowServerTestBase::OnEmbedRootDestroyed(

[msw, 2016/12/08 01:20:11]

optional nit: share code with WindowServerTestBase::OnWmDisplayRemoved?

[sky, 2016/12/08 04:59:45]

Done.

+    aura::WindowTreeHostMus* window_tree_host) {
+  for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end();
+       ++iter) {
+    if (iter->get() == window_tree_host) {
+      window_tree_hosts_.erase(iter);
+      return;
+    }
+  }
+  // Assume a subclass called Embed() and wants us to destroy it.
+  delete window_tree_host;
+}
+
+void WindowServerTestBase::OnPointerEventObserved(const ui::PointerEvent& event,
+                                                  aura::Window* target) {}
+
+aura::client::CaptureClient* WindowServerTestBase::GetCaptureClient() {
+  return wm_state_.capture_controller();
+}
+
+aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() {
+  return &property_converter_;
+}
+
+void WindowServerTestBase::SetWindowManagerClient(
+    aura::WindowManagerClient* client) {
+  window_manager_client_ = client;
+}
+
+bool WindowServerTestBase::OnWmSetBounds(aura::Window* window,
+                                         gfx::Rect* bounds) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnWmSetBounds(window, bounds)
+             : true;
+}
+
+bool WindowServerTestBase::OnWmSetProperty(
+    aura::Window* window,
+    const std::string& name,
+    std::unique_ptr<std::vector<uint8_t>>* new_data) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnWmSetProperty(window, name, new_data)
+             : true;
+}
+
+aura::Window* WindowServerTestBase::OnWmCreateTopLevelWindow(
+    ui::mojom::WindowType window_type,
+    std::map<std::string, std::vector<uint8_t>>* properties) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnWmCreateTopLevelWindow(window_type,
+                                                                  properties)
+             : nullptr;
+}
+
+void WindowServerTestBase::OnWmClientJankinessChanged(
+    const std::set<aura::Window*>& client_windows,
+    bool janky) {
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmClientJankinessChanged(client_windows, janky);
+}
+
+void WindowServerTestBase::OnWmWillCreateDisplay(
+    const display::Display& display) {
+  screen_.display_list().AddDisplay(display,
+                                    display::DisplayList::Type::PRIMARY);
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmWillCreateDisplay(display);
+}
+
+void WindowServerTestBase::OnWmNewDisplay(
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
+    const display::Display& display) {
+  EXPECT_TRUE(QuitRunLoop());
+  ASSERT_TRUE(window_manager_client_);
+  window_manager_client_->AddActivationParent(window_tree_host->window());
+  window_tree_hosts_.push_back(std::move(window_tree_host));
+
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmNewDisplay(nullptr, display);
+}
+
+void WindowServerTestBase::OnWmDisplayRemoved(
+    aura::WindowTreeHostMus* window_tree_host) {
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmDisplayRemoved(window_tree_host);
+  for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end();
+       ++iter) {
+    if ((*iter).get() == window_tree_host) {
+      window_tree_hosts_.erase(iter);
+      return;
+    }
+  }
+  NOTREACHED();
+}
+
+void WindowServerTestBase::OnWmDisplayModified(
+    const display::Display& display) {
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmDisplayModified(display);
+}
+
+ui::mojom::EventResult WindowServerTestBase::OnAccelerator(
+    uint32_t accelerator_id,
+    const ui::Event& event) {
+  return window_manager_delegate_
+             ? window_manager_delegate_->OnAccelerator(accelerator_id, event)
+             : ui::mojom::EventResult::UNHANDLED;
+}
+
+void WindowServerTestBase::OnWmPerformMoveLoop(
+    aura::Window* window,
+    ui::mojom::MoveLoopSource source,
+    const gfx::Point& cursor_location,
+    const base::Callback<void(bool)>& on_done) {
+  if (window_manager_delegate_) {
+    window_manager_delegate_->OnWmPerformMoveLoop(window, source,
+                                                  cursor_location, on_done);
+  }
+}
+
+void WindowServerTestBase::OnWmCancelMoveLoop(aura::Window* window) {
+  if (window_manager_delegate_)
+    window_manager_delegate_->OnWmCancelMoveLoop(window);
+}
+
+void WindowServerTestBase::OnWmSetClientArea(
+    aura::Window* window,
+    const gfx::Insets& insets,
+    const std::vector<gfx::Rect>& additional_client_areas) {}

[msw, 2016/12/08 01:20:11]

Should this also call through to the delegate?

[sky, 2016/12/08 04:59:45]

Done.

+
+void WindowServerTestBase::Create(
+    const service_manager::Identity& remote_identity,
+    mojom::WindowTreeClientRequest request) {
+  window_tree_clients_.push_back(base::MakeUnique<aura::WindowTreeClient>(
+      connector(), this, nullptr, std::move(request)));
+}
+
+}  // namespace ui