Promotes remaining global window manager state into 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 "components/mus/ws/window_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/platform_display_factory.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_surface_manager_test_api.h"
 #include "components/mus/ws/test_change_tracker.h"
 #include "components/mus/ws/test_server_window_delegate.h"
 #include "components/mus/ws/test_utils.h"
 #include "components/mus/ws/window_manager_access_policy.h"
+#include "components/mus/ws/window_manager_display_root.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_server_delegate.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mus {
@@ skipping 36 matching lines @@
 }
 
 ui::PointerEvent CreateMouseUpEvent(int x, int y) {
   return ui::PointerEvent(
       ui::MouseEvent(ui::ET_MOUSE_RELEASED, gfx::Point(x, y), gfx::Point(x, y),
                      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                      ui::EF_LEFT_MOUSE_BUTTON));
 }
 
 ServerWindow* GetCaptureWindow(Display* display) {
-  return display->GetActiveWindowManagerState()->capture_window();
+  return display->GetActiveWindowManagerDisplayRoot()
+      ->window_manager_state()
+      ->capture_window();
 }
 
 mojom::EventMatcherPtr CreateEventMatcher(ui::mojom::EventType type) {
   mojom::EventMatcherPtr matcher = mojom::EventMatcher::New();
   matcher->type_matcher = mojom::EventTypeMatcher::New();
   matcher->type_matcher->type = type;
   return matcher;
 }
 
 }  // namespace
@@ skipping 30 matching lines @@
     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() {
     WindowManagerStateTestApi test_api(
-        display()->GetActiveWindowManagerState());
+        display()->GetActiveWindowManagerDisplayRoot()->window_manager_state());
     while (test_api.tree_awaiting_input_ack()) {
       test_api.tree_awaiting_input_ack()->OnWindowInputEventAck(
           0, mojom::EventResult::HANDLED);
     }
   }
 
   void DispatchEventAndAckImmediately(const ui::Event& event) {
     DispatchEventWithoutAck(event);
     AckPreviousEvent();
   }
@@ skipping 841 matching lines @@
   ServerWindow* window = window_event_targeting_helper_.CreatePrimaryTree(
       gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 50, 50));
   WindowTree* owning_tree =
       window_server()->GetTreeWithId(window->id().client_id);
   WindowTree* embed_tree = window_server()->GetTreeWithRoot(window);
   ASSERT_NE(owning_tree, embed_tree);
   ASSERT_TRUE(
       owning_tree->SetCapture(ClientWindowIdForWindow(owning_tree, window)));
   DispatchEventWithoutAck(CreateMouseMoveEvent(21, 22));
   WindowManagerStateTestApi wm_state_test_api(
-      display()->GetActiveWindowManagerState());
+      display()->GetActiveWindowManagerDisplayRoot()->window_manager_state());
   EXPECT_EQ(owning_tree, wm_state_test_api.tree_awaiting_input_ack());
   AckPreviousEvent();
 
   // Set capture from the embedded client and make sure it gets the event.
   ASSERT_TRUE(
       embed_tree->SetCapture(ClientWindowIdForWindow(embed_tree, window)));
   DispatchEventWithoutAck(CreateMouseMoveEvent(22, 23));
   EXPECT_EQ(embed_tree, wm_state_test_api.tree_awaiting_input_ack());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus