[Cleanup] Screen cleanup

chrome/browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc

 // Copyright 2013 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/extensions/api/system_display/display_info_provider.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
-#include "ash/screen_ash.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 "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 
 namespace extensions {
 namespace {
@@ skipping 285 matching lines @@
   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");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-520));
   info.bounds_origin_y.reset(new int(50));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-520,50 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightExact) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1200));
   info.bounds_origin_y.reset(new int(100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("1200,100 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopExact) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1100));
   info.bounds_origin_y.reset(new int(-400));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("1100,-400 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginBottomExact) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-350));
   info.bounds_origin_y.reset(new int(600));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-350,600 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSameCenter) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(340));
   info.bounds_origin_y.reset(new int(100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("1200,100 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftOutside) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-1040));
   info.bounds_origin_y.reset(new int(100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-520,100 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopOutside) {
   UpdateDisplay("1200x600,520x400");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-360));
   info.bounds_origin_y.reset(new int(-301));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-360,-400 520x400", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest,
        SetBoundsOriginLeftButSharesBottomSide) {
   UpdateDisplay("1200x600,1000x100");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-650));
   info.bounds_origin_y.reset(new int(700));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-650,600 1000x100", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest,
        SetBoundsOriginRightButSharesTopSide) {
   UpdateDisplay("1200x600,1000x100");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(850));
   info.bounds_origin_y.reset(new int(-150));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("850,-100 1000x100", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest,
        SetBoundsOriginTopButSharesLeftSide) {
   UpdateDisplay("1200x600,1000x100/l");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-150));
   info.bounds_origin_y.reset(new int(-650));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("-100,-650 100x1000", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest,
        SetBoundsOriginBottomButSharesRightSide) {
   UpdateDisplay("1200x600,1000x100/l");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1350));
   info.bounds_origin_y.reset(new int(450));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("1200,450 100x1000", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginPrimaryHiDPI) {
   UpdateDisplay("1200x600*2,500x500");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(250));
   info.bounds_origin_y.reset(new int(-100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("600,-100 500x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSecondaryHiDPI) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(450));
   info.bounds_origin_y.reset(new int(-100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(error.empty());
 
   EXPECT_EQ("450,-500 300x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBounds) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(0x200001));
   info.bounds_origin_y.reset(new int(-100));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   ASSERT_EQ("Bounds origin x out of bounds.", error);
 
   EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBoundsNegative) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.bounds_origin_y.reset(new int(-0x200001));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   ASSERT_EQ("Bounds origin y out of bounds.", error);
 
   EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginMaxValues) {
   UpdateDisplay("1200x4600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(200000));
   info.bounds_origin_y.reset(new int(10));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("1200,10 300x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.is_primary.reset(new bool(true));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   ASSERT_EQ("Bounds origin not allowed for the primary display.", error);
 
   EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
   // The operation failed because the primary property would be set before
   // setting bounds. The primary display shouldn't have been changed, though.
-  EXPECT_NE(ash::DisplayController::GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_NE(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  const gfx::Display& primary = GetDisplayController()->GetPrimaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+  const gfx::Display& primary = ash::Shell::GetScreen()->GetPrimaryDisplay();
 
   api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.mirroring_source_id.reset(
       new std::string(base::Int64ToString(primary.id())));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   ASSERT_EQ("No other parameter should be set alongside mirroringSourceId.",
             error);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(90));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
@@ skipping 15 matching lines @@
   // Switch primary display.
   info.is_primary.reset(new bool(true));
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_180, secondary.rotation());
-  EXPECT_EQ(ash::DisplayController::GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 
   info.rotation.reset(new int(0));
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_0, secondary.rotation());
-  EXPECT_EQ(ash::DisplayController::GetPrimaryDisplay().id(), secondary.id());
+  EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(91));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Invalid rotation.", error);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.overscan.reset(new api::system_display::Insets);
   info.overscan->left= -10;
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
@@ skipping 42 matching lines @@
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanHorizontalBounds) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.overscan.reset(new api::system_display::Insets);
   // Horizontal overscan is 151, which would make the bounds width 149.
   info.overscan->left= 50;
   info.overscan->top = 10;
   info.overscan->right = 101;
   info.overscan->bottom = 20;
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Horizontal overscan is more than half of the screen width.",
             error);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
   UpdateDisplay("1200x600,600x1000");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   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 = 250;
   info.overscan->right = 101;
   info.overscan->bottom = 251;
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Vertical overscan is more than half of the screen height.",
             error);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetOverscan) {
   UpdateDisplay("1200x600,600x1000*2");
 
-  const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
+  const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.overscan.reset(new api::system_display::Insets);
   info.overscan->left= 20;
   info.overscan->top = 199;
   info.overscan->right = 130;
   info.overscan->bottom = 51;
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info,
@@ skipping 31 matching lines @@
   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