Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_manager_state_unittest.cc

 // 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.
 
 #include "components/mus/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/accelerator.h"
+#include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/platform_display_init_params.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_manager_state.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_tree.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 
 namespace mus {
 namespace ws {
 namespace test {
@@ skipping 78 matching lines @@
 }
 
 void WindowManagerStateTest::OnEventAckTimeout(
     ClientSpecificId client_id) {
   WindowManagerStateTestApi test_api(window_manager_state_);
   test_api.OnEventAckTimeout(client_id);
 }
 
 void WindowManagerStateTest::SetUp() {
   window_event_targeting_helper_.SetTaskRunner(task_runner_);
-  window_manager_state_ =
-      window_event_targeting_helper_.display()->GetActiveWindowManagerState();
+  window_manager_state_ = window_event_targeting_helper_.display()
+                              ->GetActiveWindowManagerDisplayRoot()
+                              ->window_manager_state();
   window_ = window_event_targeting_helper_.CreatePrimaryTree(
       gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 50, 50));
   window_tree_ = window_event_targeting_helper_.last_binding()->tree();
   window_tree_client_ =
       window_event_targeting_helper_.last_window_tree_client();
   DCHECK(window_tree_->HasRoot(window_));
 
   WindowTreeTestApi(tree()).set_window_manager_internal(&window_manager_);
   wm_client()->tracker()->changes()->clear();
   window_tree_client_->tracker()->changes()->clear();
@@ skipping 155 matching lines @@
             ChangesToDescription1(*tracker->changes())[0]);
 
   OnEventAckTimeout(window()->id().client_id);
   EXPECT_TRUE(window_manager()->on_accelerator_called());
   EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus