Split //ui/display and create //ui/display/manager.

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>
 
@@ skipping 15 matching lines @@
 #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/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 
 namespace em = enterprise_management;
 
 namespace {
 
 display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
@@ skipping 278 matching lines @@
 }
 
 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