Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.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/manager/display_layout.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace extensions {
 namespace {
 
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
   DisplayInfoProviderChromeosTest() {}
 
@@ skipping 362 matching lines @@
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ(base::Int64ToString(display_id_primary), result[0].id);
   EXPECT_TRUE(result[0].mirroring_source_id.empty());
   EXPECT_EQ(base::Int64ToString(display_id_secondary), result[1].id);
   EXPECT_TRUE(result[1].mirroring_source_id.empty());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {
   UpdateDisplay("600x600, 400x520");
   GetDisplayManager()->SetLayoutForCurrentDisplays(
-      ash::test::CreateDisplayLayout(ash::DisplayPlacement::LEFT, -40));
+      ash::test::CreateDisplayLayout(display::DisplayPlacement::LEFT, -40));
 
   DisplayInfo result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0].bounds));
   EXPECT_EQ("-400,-40 400x520",
             SystemInfoDisplayBoundsToString(result[1].bounds));
 
   GetDisplayManager()->SetLayoutForCurrentDisplays(
-      ash::test::CreateDisplayLayout(ash::DisplayPlacement::TOP, 40));
+      ash::test::CreateDisplayLayout(display::DisplayPlacement::TOP, 40));
 
   result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0].bounds));
   EXPECT_EQ("40,-520 400x520",
             SystemInfoDisplayBoundsToString(result[1].bounds));
 
   GetDisplayManager()->SetLayoutForCurrentDisplays(
-      ash::test::CreateDisplayLayout(ash::DisplayPlacement::BOTTOM, 80));
+      ash::test::CreateDisplayLayout(display::DisplayPlacement::BOTTOM, 80));
 
   result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0].bounds));
   EXPECT_EQ("80,600 400x520",
             SystemInfoDisplayBoundsToString(result[1].bounds));
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
   UpdateDisplay("1200x600,520x400");
@@ skipping 629 matching lines @@
   std::string error;
   CallSetDisplayUnitInfo(
       base::Int64ToString(internal_display_id), info, &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Overscan changes not allowed for the internal monitor.", error);
 }
 
 }  // namespace
 }  // namespace extensions