Revert of chromeos: Makes mushrome use simplified display management

ash/mus/test/wm_test_base.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_base.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "ash/display/window_tree_host_manager.h"
 #include "ash/mus/test/wm_test_helper.h"
 #include "ash/mus/top_level_window_factory.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
-#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/session_types.h"
 #include "ash/public/interfaces/session_controller.mojom.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/test/wm_window_test_api.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
-#include "ui/display/manager/display_manager.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 ui::mojom::WindowType MusWindowTypeFromWmWindowType(
     ui::wm::WindowType wm_window_type) {
   switch (wm_window_type) {
     case ui::wm::WINDOW_TYPE_UNKNOWN:
       break;
@@ skipping 30 matching lines @@
       << "You have overridden SetUp but never called WmTestBase::SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called WmTestBase::TearDown";
 }
 
 void WmTestBase::UpdateDisplay(const std::string& display_spec) {
   test_helper_->UpdateDisplay(display_spec);
 }
 
 aura::Window* WmTestBase::GetPrimaryRootWindow() {
-  return Shell::Get()->GetPrimaryRootWindow();
+  std::vector<RootWindowController*> roots =
+      test_helper_->GetRootsOrderedByDisplayId();
+  DCHECK(!roots.empty());
+  return roots[0]->GetRootWindow();
 }
 
 aura::Window* WmTestBase::GetSecondaryRootWindow() {
-  if (Shell::GetAshConfig() == Config::MUS) {
-    return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
-        GetSecondaryDisplay().id());
-  }
-
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   return roots.size() < 2 ? nullptr : roots[1]->GetRootWindow();
 }
 
 display::Display WmTestBase::GetPrimaryDisplay() {
-  if (Shell::GetAshConfig() == Config::MUS) {
-    return display::Screen::GetScreen()->GetDisplayNearestWindow(
-        Shell::Get()->GetPrimaryRootWindow());
-  }
-
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   DCHECK(!roots.empty());
   return roots[0]->GetWindow()->GetDisplayNearestWindow();
 }
 
 display::Display WmTestBase::GetSecondaryDisplay() {
-  if (Shell::GetAshConfig() == Config::MUS)
-    return Shell::Get()->display_manager()->GetSecondaryDisplay();
-
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   return roots.size() < 2 ? display::Display()
                           : roots[1]->GetWindow()->GetDisplayNearestWindow();
 }
 
 aura::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds) {
   return CreateTestWindow(bounds, ui::wm::WINDOW_TYPE_NORMAL);
 }
 
@@ skipping 73 matching lines @@
   info->can_lock_screen = true;
   info->should_lock_screen_automatically = false;
   info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
   info->state = session_manager::SessionState::ACTIVE;
   session_controller->SetSessionInfo(std::move(info));
 }
 
 
 }  // namespace mus
 }  // namespace ash