Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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 <stdint.h>
 
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #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/manager/display_layout.h"
 #include "ui/gfx/display.h"
 
 namespace em = enterprise_management;
 
 namespace {
 
 ash::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
 gfx::Display::Rotation GetRotationOfFirstDisplay() {
   const ash::DisplayManager* const display_manager = GetDisplayManager();
   const int64_t first_display_id = display_manager->first_display_id();
   const gfx::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.
 gfx::Display::Rotation GetRotationOfSecondDisplay() {
   const ash::DisplayManager* const display_manager = GetDisplayManager();
   if (display_manager->GetNumDisplays() < 2) {
     ADD_FAILURE()
         << "Requested rotation of second display while there was only one.";
     return gfx::Display::ROTATE_0;
   }
-  const ash::DisplayIdList display_id_pair =
+  const display::DisplayIdList display_id_pair =
       display_manager->GetCurrentDisplayIdList();
   const gfx::Display& second_display =
       display_manager->GetDisplayForId(display_id_pair[1]);
   return second_display.rotation();
 }
 
 } // anonymous namespace
 
 namespace policy {
 
@@ skipping 251 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(PolicyDisplayRotationDefault,
                         DisplayRotationBootTest,
                         testing::Values(gfx::Display::ROTATE_0,
                                         gfx::Display::ROTATE_90,
                                         gfx::Display::ROTATE_180,
                                         gfx::Display::ROTATE_270));
 
 }  // namespace policy