Relocate display_manager from ash to ui

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/display_manager.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.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_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/gfx/geometry/rect.h"
 
 namespace extensions {
 namespace {
 
 using DisplayUnitInfoList = DisplayInfoProvider::DisplayUnitInfoList;
 using DisplayLayoutList = DisplayInfoProvider::DisplayLayoutList;
 
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
@@ skipping 17 matching lines @@
     (*error).clear();
     *success = DisplayInfoProvider::Get()->SetInfo(display_id, info, error);
   }
 
   bool DisplayExists(int64_t display_id) const {
     const display::Display& display =
         GetDisplayManager()->GetDisplayForId(display_id);
     return display.id() != display::Display::kInvalidDisplayID;
   }
 
-  ash::DisplayManager* GetDisplayManager() const {
+  display::DisplayManager* GetDisplayManager() const {
     return ash::Shell::GetInstance()->display_manager();
   }
 
   std::string SystemInfoDisplayInsetsToString(
       const api::system_display::Insets& insets) const {
     // Order to match gfx::Insets::ToString().
     return base::StringPrintf(
         "%d,%d,%d,%d", insets.top, insets.left, insets.bottom, insets.right);
   }
 
@@ skipping 329 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(display_manager(),
-                                     display::DisplayPlacement::LEFT, -40));
+      display::test::CreateDisplayLayout(display_manager(),
+                                         display::DisplayPlacement::LEFT, -40));
 
   DisplayUnitInfoList 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(display_manager(),
-                                     display::DisplayPlacement::TOP, 40));
+      display::test::CreateDisplayLayout(display_manager(),
+                                         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(display_manager(),
-                                     display::DisplayPlacement::BOTTOM, 80));
+      display::test::CreateDisplayLayout(
+          display_manager(), 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, Layout) {
   UpdateDisplay("500x400,500x400,500x400");
@@ skipping 668 matching lines @@
 
   EXPECT_EQ(20, overscan.left());
   EXPECT_EQ(199, overscan.top());
   EXPECT_EQ(130, overscan.right());
   EXPECT_EQ(51, overscan.bottom());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetOverscanForInternal) {
   UpdateDisplay("1200x600,600x1000*2");
   const int64_t internal_display_id =
-      ash::test::DisplayManagerTestApi(
+      display::test::DisplayManagerTestApi(
           ash::Shell::GetInstance()->display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   api::system_display::DisplayProperties info;
   info.overscan.reset(new api::system_display::Insets);
   // Vertical overscan is 501, which would make the bounds height 499.
   info.overscan->left = 20;
   info.overscan->top = 20;
   info.overscan->right = 20;
   info.overscan->bottom = 20;
@@ skipping 56 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