Converts WindowTreeClientTest to be in terms of aura

services/ui/ws/window_server_test_base.h

Index: services/ui/ws/window_server_test_base.h
diff --git a/services/ui/ws/window_server_test_base.h b/services/ui/ws/window_server_test_base.h
new file mode 100644
index 0000000000000000000000000000000000000000..ef4c0b9accc1ab642f2d3f1d5967a32166158106
--- /dev/null
+++ b/services/ui/ws/window_server_test_base.h
@@ -0,0 +1,160 @@
+// 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.
+
+#ifndef SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
+#define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
+
+#include <memory>
+#include <set>
+
+#include "base/macros.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/ui/public/interfaces/window_tree.mojom.h"
+#include "services/ui/ws/window_server_service_test_base.h"
+#include "ui/aura/mus/property_converter.h"
+#include "ui/aura/mus/window_manager_delegate.h"
+#include "ui/aura/mus/window_tree_client_delegate.h"
+#include "ui/display/screen_base.h"
+#include "ui/wm/core/wm_state.h"
+
+namespace aura {
+class Env;
+class MusContextFactory;
+}
+
+namespace ui {
+class GpuService;
+
+// WindowServerTestBase is a base class for use with shell tests that use
+// WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed()
+// has been invoked. window_manager() can be used to access the WindowServer
+// established as part of SetUp().
+class WindowServerTestBase
+    : public WindowServerServiceTestBase,
+      public aura::WindowTreeClientDelegate,
+      public aura::WindowManagerDelegate,
+      public service_manager::InterfaceFactory<mojom::WindowTreeClient> {
+ public:
+  WindowServerTestBase();
+  ~WindowServerTestBase() override;
+
+  // True if WindowTreeClientDelegate::OnLostConnection() was called.
+  bool window_tree_client_lost_connection() const {
+    return window_tree_client_lost_connection_;
+  }
+
+  // Runs the MessageLoop until QuitRunLoop() is called, or a timeout occurs.
+  // Returns true on success. Generally prefer running a RunLoop and
+  // explicitly quiting that, but use this for times when that is not possible.
+  static bool DoRunLoopWithTimeout() WARN_UNUSED_RESULT;
+
+  // Quits a run loop started by DoRunLoopWithTimeout(). Returns true on
+  // success, false if a RunLoop isn't running.
+  static bool QuitRunLoop() WARN_UNUSED_RESULT;
+
+  aura::WindowTreeClient* window_manager() { return window_manager_; }
+  aura::WindowManagerClient* window_manager_client() {
+    return window_manager_client_;
+  }
+
+ protected:
+  void set_window_manager_delegate(aura::WindowManagerDelegate* delegate) {
+    window_manager_delegate_ = delegate;
+  }
+
+  // Cleans up internal state then deletes |client|.
+  void DeleteWindowTreeClient(aura::WindowTreeClient* client);
+
+  // Returns the most WindowTreeClient that was created as the result of

[msw, 2016/12/08 19:07:41]

wow, which one is the *most WindowTreeClient*? lol, such doge grammar :)
http://weknowmemes.com/generator/uploads/generated/g1389215111816185047.jpg

[sky, 2016/12/12 18:35:59]

Ha!

+  // InterfaceFactory<WindowTreeClient> being called. In other words the most
+  // recent WindowTreeClient created for an embed.

[msw, 2016/12/08 19:07:41]

nit: "created as the result of a client embedding" or similar?

[sky, 2016/12/12 18:35:59]

Done.

+  std::unique_ptr<aura::WindowTreeClient> ReleaseMostRecentClient();
+
+  // testing::Test:
+  void SetUp() override;
+  void TearDown() override;
+
+  // WindowServerServiceTestBase:
+  bool OnConnect(const service_manager::Identity& remote_identity,
+                 service_manager::InterfaceRegistry* registry) override;
+
+  // WindowTreeClientDelegate:
+  void OnEmbed(
+      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
+  void OnLostConnection(aura::WindowTreeClient* client) override;
+  void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
+  void OnPointerEventObserved(const ui::PointerEvent& event,
+                              aura::Window* target) override;
+  aura::client::CaptureClient* GetCaptureClient() override;
+  aura::PropertyConverter* GetPropertyConverter() override;
+
+  // WindowManagerDelegate:
+  void SetWindowManagerClient(aura::WindowManagerClient* client) override;
+  bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
+  bool OnWmSetProperty(
+      aura::Window* window,
+      const std::string& name,
+      std::unique_ptr<std::vector<uint8_t>>* new_data) override;
+  aura::Window* OnWmCreateTopLevelWindow(
+      ui::mojom::WindowType window_type,
+      std::map<std::string, std::vector<uint8_t>>* properties) override;
+  void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows,
+                                  bool not_responding) override;
+  void OnWmWillCreateDisplay(const display::Display& display) override;
+  void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
+                      const display::Display& display) override;
+  void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override;
+  void OnWmDisplayModified(const display::Display& display) override;
+  mojom::EventResult OnAccelerator(uint32_t accelerator_id,
+                                   const ui::Event& event) override;
+  void OnWmPerformMoveLoop(aura::Window* window,
+                           mojom::MoveLoopSource source,
+                           const gfx::Point& cursor_location,
+                           const base::Callback<void(bool)>& on_done) override;
+  void OnWmCancelMoveLoop(aura::Window* window) override;
+  void OnWmSetClientArea(
+      aura::Window* window,
+      const gfx::Insets& insets,
+      const std::vector<gfx::Rect>& additional_client_areas) override;
+
+  // InterfaceFactory<WindowTreeClient>:
+  void Create(const service_manager::Identity& remote_identity,
+              mojo::InterfaceRequest<mojom::WindowTreeClient> request) override;
+
+ private:
+  // Removes |window_tree_host| from |window_tree_hosts_| and deletes it.
+  // Returns true on success, and false if not found, in which case
+  // |window_tree_host| is not deleted.
+  bool DeleteWindowTreeHost(aura::WindowTreeHostMus* window_tree_host);
+
+  std::unique_ptr<aura::Env> env_;
+  ::wm::WMState wm_state_;
+  display::ScreenBase screen_;
+  aura::PropertyConverter property_converter_;
+
+  std::unique_ptr<GpuService> gpu_service_;
+  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
+
+  std::vector<std::unique_ptr<aura::WindowTreeClient>> window_tree_clients_;
+
+  std::vector<std::unique_ptr<aura::WindowTreeHostMus>> window_tree_hosts_;
+
+  // The window server connection held by the window manager (app running at
+  // the root window).
+  aura::WindowTreeClient* window_manager_ = nullptr;
+
+  // A test can override the WM-related behaviour by installing its own
+  // WindowManagerDelegate during the test.
+  aura::WindowManagerDelegate* window_manager_delegate_ = nullptr;
+
+  aura::WindowManagerClient* window_manager_client_ = nullptr;
+
+  bool window_tree_client_lost_connection_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
+};
+
+}  // namespace ui
+
+#endif  // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_