services/ui: Add WindowServerTestHelper.

services/ui/ws/test_utils.h

 // Copyright 2016 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_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 487 matching lines @@
   bool got_on_no_more_displays_ = false;
   // All TestWindowTreeBinding objects created via CreateWindowTreeBinding.
   // These are owned by the corresponding WindowTree.
   std::vector<TestWindowTreeBinding*> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowServerDelegate);
 };
 
 // -----------------------------------------------------------------------------
 
+// Helper class which creates and sets up the necessary objects for tests that
+// use the WindowServer.
+class WindowServerTestHelper {
+ public:
+  WindowServerTestHelper();
+  ~WindowServerTestHelper();
+
+  WindowServer* window_server() { return window_server_.get(); }
+  int32_t cursor_id() const { return cursor_id_; }
+
+  TestWindowServerDelegate* window_server_delegate() {
+    return &window_server_delegate_;
+  }
+  base::MessageLoop* message_loop() { return &message_loop_; }
+
+ private:
+  int32_t cursor_id_;
+  TestPlatformDisplayFactory platform_display_factory_;
+  TestWindowServerDelegate window_server_delegate_;
+  std::unique_ptr<WindowServer> window_server_;
+  base::MessageLoop message_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(WindowServerTestHelper);
+};
+
+// -----------------------------------------------------------------------------
+
 // Helper class which owns all of the necessary objects to test event targeting
 // of ServerWindow objects.
 class WindowEventTargetingHelper {
  public:
   WindowEventTargetingHelper();
   ~WindowEventTargetingHelper();
 
   // Creates |window| as an embeded window of the primary tree. This window is a
   // root window of its own tree, with bounds |window_bounds|. The bounds of the
   // root window of |display_| are defined by |root_window_bounds|.
   ServerWindow* CreatePrimaryTree(const gfx::Rect& root_window_bounds,
                                   const gfx::Rect& window_bounds);
   // Creates a secondary tree, embedded as a child of |embed_window|. The
   // resulting |window| is setup for event targeting, with bounds
   // |window_bounds|.
   void CreateSecondaryTree(ServerWindow* embed_window,
                            const gfx::Rect& window_bounds,
                            TestWindowTreeClient** out_client,
                            WindowTree** window_tree,
                            ServerWindow** window);
   // Sets the task runner for |message_loop_|
   void SetTaskRunner(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
-  int32_t cursor_id() { return cursor_id_; }
+  int32_t cursor_id() const { return ws_test_helper_.cursor_id(); }
   Display* display() { return display_; }
   TestWindowTreeBinding* last_binding() {
-    return window_server_delegate_.last_binding();
+    return ws_test_helper_.window_server_delegate()->last_binding();
   }
   TestWindowTreeClient* last_window_tree_client() {
-    return window_server_delegate_.last_client();
+    return ws_test_helper_.window_server_delegate()->last_client();
   }
   TestWindowTreeClient* wm_client() { return wm_client_; }
-  WindowServer* window_server() { return window_server_.get(); }
+  WindowServer* window_server() { return ws_test_helper_.window_server(); }
 
  private:
+  WindowServerTestHelper ws_test_helper_;
   // TestWindowTreeClient that is used for the WM client. Owned by
   // |window_server_delegate_|
   TestWindowTreeClient* wm_client_;
-  int32_t cursor_id_;
-  TestPlatformDisplayFactory platform_display_factory_;
-  TestWindowServerDelegate window_server_delegate_;
   // Owned by WindowServer
   TestDisplayBinding* display_binding_;
   // Owned by WindowServer's DisplayManager.
   Display* display_;
   scoped_refptr<SurfacesState> surfaces_state_;
-  std::unique_ptr<WindowServer> window_server_;
-  // Needed to Bind to |wm_client_|
-  base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
 };
 
 // -----------------------------------------------------------------------------
 
 // Returns the first and only root of |tree|. If |tree| has zero or more than
 // one root returns null.
 ServerWindow* FirstRoot(WindowTree* tree);
 
@@ skipping 10 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_