Relocate display_manager from ash to ui

chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc

 // Copyright 2015 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 "chrome/browser/chromeos/policy/display_rotation_default_handler.h"
 
 #include <stdint.h>
 
 #include <memory>
 
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager.h"
 
 namespace em = enterprise_management;
 
 namespace {
 
-ash::DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
 display::Display::Rotation GetRotationOfFirstDisplay() {
-  const ash::DisplayManager* const display_manager = GetDisplayManager();
+  const display::DisplayManager* const display_manager = GetDisplayManager();
   const int64_t first_display_id = display_manager->first_display_id();
   const display::Display& first_display =
       display_manager->GetDisplayForId(first_display_id);
   return first_display.rotation();
 }
 
 // Fails the test and returns ROTATE_0 if there is no second display.
 display::Display::Rotation GetRotationOfSecondDisplay() {
-  const ash::DisplayManager* const display_manager = GetDisplayManager();
+  const display::DisplayManager* const display_manager = GetDisplayManager();
   if (display_manager->GetNumDisplays() < 2) {
     ADD_FAILURE()
         << "Requested rotation of second display while there was only one.";
     return display::Display::ROTATE_0;
   }
   const display::DisplayIdList display_id_pair =
       display_manager->GetCurrentDisplayIdList();
   const display::Display& second_display =
       display_manager->GetDisplayForId(display_id_pair[1]);
   return second_display.rotation();
@@ skipping 229 matching lines @@
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription> observer =
       chromeos::CrosSettings::Get()->AddSettingsObserver(
           chromeos::kDisplayRotationDefault, run_loop.QuitClosure());
   device_policy->SetDefaultSigningKey();
   device_policy->Build();
   fake_session_manager_client_->set_device_policy(device_policy->GetBlob());
   fake_session_manager_client_->OnPropertyChangeComplete(true);
   run_loop.Run();
 
   // Check the display's rotation.
-  ash::DisplayManager* const display_manager = GetDisplayManager();
+  display::DisplayManager* const display_manager = GetDisplayManager();
   const int64_t first_display_id = display_manager->first_display_id();
   const display::Display& first_display =
       display_manager->GetDisplayForId(first_display_id);
   EXPECT_EQ(policy_rotation, first_display.rotation());
 
   // Let the user rotate the display to a different orientation, to check that
   // the policy value is restored after reboot.
   display_manager->SetDisplayRotation(first_display_id, user_rotation,
                                       display::Display::ROTATION_SOURCE_USER);
   EXPECT_EQ(user_rotation, first_display.rotation());
 }
 
 IN_PROC_BROWSER_TEST_P(DisplayRotationBootTest, Reboot) {
   const display::Display::Rotation policy_rotation = GetParam();
 
   // Check that the policy rotation is restored.
   EXPECT_EQ(policy_rotation, GetRotationOfFirstDisplay());
 }
 
 INSTANTIATE_TEST_CASE_P(PolicyDisplayRotationDefault,
                         DisplayRotationBootTest,
                         testing::Values(display::Display::ROTATE_0,
                                         display::Display::ROTATE_90,
                                         display::Display::ROTATE_180,
                                         display::Display::ROTATE_270));
 
 }  // namespace policy