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

chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

 // Copyright 2014 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 "extensions/browser/api/system_display/display_info_provider.h"
 
 #include <stdint.h>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/display/display.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/display_switches.h"
-#include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace extensions {
 namespace {
 
 using DisplayUnitInfoList = DisplayInfoProvider::DisplayUnitInfoList;
 using DisplayLayoutList = DisplayInfoProvider::DisplayLayoutList;
@@ skipping 1159 matching lines @@
   CallSetDisplayUnitInfo(base::Int64ToString(id), info, &success, &error);
   ASSERT_TRUE(success);
 
   // Verify that other_mode now matches the active mode.
   active_mode = GetDisplayManager()->GetActiveModeForDisplayId(id);
   EXPECT_TRUE(active_mode->IsEquivalent(other_mode_ash));
 }
 
 }  // namespace
 }  // namespace extensions