Removes ash::mus::RootWindowController

ash/mus/test/wm_test_helper.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 "ash/mus/test/wm_test_helper.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
-#include "ash/mus/root_window_controller.h"
+#include "ash/common/wm_window.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/aura/window.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/display/display.h"
 #include "ui/display/display_list.h"
 #include "ui/display/screen_base.h"
 #include "ui/views/test/test_views_delegate.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
-bool CompareByDisplayId(const RootWindowController* root1,
-                        const RootWindowController* root2) {
-  return root1->display().id() < root2->display().id();
+bool CompareByDisplayId(RootWindowController* root1,
+                        RootWindowController* root2) {
+  return root1->GetWindow()->GetDisplayNearestWindow().id() <
+         root2->GetWindow()->GetDisplayNearestWindow().id();
 }
 
 // TODO(sky): at some point this needs to support everything in DisplayInfo,
 // for now just the bare minimum, which is [x+y-]wxh.
 gfx::Rect ParseDisplayBounds(const std::string& spec) {
   gfx::Rect bounds;
   const std::vector<std::string> parts =
       base::SplitString(spec, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   std::string size_spec;
   if (parts.size() == 2u) {
@@ skipping 118 matching lines @@
   window_tree_client_private_->CallWmNewDisplayAdded(display);
   return GetRootsOrderedByDisplayId().back();
 }
 
 void WmTestHelper::UpdateDisplay(RootWindowController* root_window_controller,
                                  const std::string& display_spec,
                                  int* next_x) {
   gfx::Rect bounds = ParseDisplayBounds(display_spec);
   bounds.set_x(*next_x);
   *next_x += bounds.size().width();
-  gfx::Insets work_area_insets =
-      root_window_controller->display_.GetWorkAreaInsets();
-  root_window_controller->display_.set_bounds(bounds);
-  root_window_controller->display_.UpdateWorkAreaFromInsets(work_area_insets);
-  root_window_controller->root()->SetBounds(gfx::Rect(bounds.size()));
+  display::Display updated_display =
+      root_window_controller->GetWindow()->GetDisplayNearestWindow();
+  gfx::Insets work_area_insets = updated_display.GetWorkAreaInsets();
+  updated_display.set_bounds(bounds);
+  updated_display.UpdateWorkAreaFromInsets(work_area_insets);
+  root_window_controller->GetWindow()->SetBounds(gfx::Rect(bounds.size()));
   ScreenMus* screen = window_manager_app_->window_manager()->screen_.get();
-  const bool is_primary = screen->display_list().FindDisplayById(
-                              root_window_controller->display().id()) ==
-                          screen->display_list().GetPrimaryDisplayIterator();
+  const bool is_primary =
+      screen->display_list().FindDisplayById(updated_display.id()) ==
+      screen->display_list().GetPrimaryDisplayIterator();
   screen->display_list().UpdateDisplay(
-      root_window_controller->display(),
-      is_primary ? display::DisplayList::Type::PRIMARY
-                 : display::DisplayList::Type::NOT_PRIMARY);
+      updated_display, is_primary ? display::DisplayList::Type::PRIMARY
+                                  : display::DisplayList::Type::NOT_PRIMARY);
 }
 
 }  // namespace mus
 }  // namespace ash