Moves EventDispatcher from Display to WindowManagerState

components/mus/ws/window_tree_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 136 matching lines @@
 const ServerWindow* FirstRoot(WindowTree* tree) {
   return tree->roots().size() == 1u ? *(tree->roots().begin()) : nullptr;
 }
 
 ClientWindowId FirstRootId(WindowTree* tree) {
   return tree->roots().size() == 1u
              ? ClientWindowIdForWindow(tree, *(tree->roots().begin()))
              : ClientWindowId();
 }
 
+ServerWindow* GetCaptureWindow(Display* display) {
+  return display->GetActiveWindowManagerState()->capture_window();
+}
+
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 class WindowTreeTest : public testing::Test {
  public:
   WindowTreeTest()
       : wm_client_(nullptr),
         cursor_id_(0),
         platform_display_factory_(&cursor_id_) {}
@@ skipping 22 matching lines @@
   void DispatchEventWithoutAck(const ui::Event& event) {
     DisplayTestApi(display_).OnEvent(event);
   }
 
   void set_window_manager_internal(WindowTree* tree,
                                    mojom::WindowManager* wm_internal) {
     WindowTreeTestApi(tree).set_window_manager_internal(wm_internal);
   }
 
   void AckPreviousEvent() {
-    DisplayTestApi test_api(display_);
+    WindowManagerStateTestApi test_api(display_->GetActiveWindowManagerState());
     while (test_api.tree_awaiting_input_ack())
       test_api.tree_awaiting_input_ack()->OnWindowInputEventAck(0);
   }
 
   void DispatchEventAndAckImmediately(const ui::Event& event) {
     DispatchEventWithoutAck(event);
     AckPreviousEvent();
   }
 
   // Creates a new window from wm_tree() and embeds a new connection in
@@ skipping 418 matching lines @@
   const ServerWindow* root_window = *tree->roots().begin();
   tree->AddWindow(FirstRootId(tree), ClientWindowIdForWindow(tree, window));
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   ASSERT_TRUE(tree->GetDisplay(window));
 
   // Setting capture should fail when there are no active events
   mojom::WindowTree* mojom_window_tree = static_cast<mojom::WindowTree*>(tree);
   uint32_t change_id = 42;
   mojom_window_tree->SetCapture(change_id, WindowIdToTransportId(window->id()));
   Display* display = tree->GetDisplay(window);
-  EXPECT_NE(window, display->GetCaptureWindow());
+  EXPECT_NE(window, GetCaptureWindow(display));
 
   // Setting capture after the event is acknowledged should fail
   DispatchEventAndAckImmediately(CreatePointerDownEvent(10, 10));
   mojom_window_tree->SetCapture(++change_id,
                                 WindowIdToTransportId(window->id()));
-  EXPECT_NE(window, display->GetCaptureWindow());
+  EXPECT_NE(window, GetCaptureWindow(display));
 
   // Settings while the event is being process should pass
   DispatchEventWithoutAck(CreatePointerDownEvent(10, 10));
   mojom_window_tree->SetCapture(++change_id,
                                 WindowIdToTransportId(window->id()));
-  EXPECT_EQ(window, display->GetCaptureWindow());
+  EXPECT_EQ(window, GetCaptureWindow(display));
   AckPreviousEvent();
 
   // Only the capture window should be able to release capture
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(root_window->id()));
-  EXPECT_EQ(window, display->GetCaptureWindow());
+  EXPECT_EQ(window, GetCaptureWindow(display));
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(window->id()));
-  EXPECT_EQ(nullptr, display->GetCaptureWindow());
+  EXPECT_EQ(nullptr, GetCaptureWindow(display));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus