Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

ash/display/window_tree_host_manager_unittest.cc

 // Copyright (c) 2012 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 "ash/display/window_tree_host_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
@@ skipping 53 matching lines @@
       : changing_count_(0),
         changed_count_(0),
         bounds_changed_count_(0),
         rotation_changed_count_(0),
         workarea_changed_count_(0),
         primary_changed_count_(0),
         changed_display_id_(0),
         focus_changed_count_(0),
         activation_changed_count_(0) {
     Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
-    Shell::GetScreen()->AddObserver(this);
+    gfx::Screen::GetScreen()->AddObserver(this);
     aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
         ->AddObserver(this);
     aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
         ->AddObserver(this);
   }
 
   ~TestObserver() override {
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
-    Shell::GetScreen()->RemoveObserver(this);
+    gfx::Screen::GetScreen()->RemoveObserver(this);
     aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
         ->RemoveObserver(this);
     aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
         ->RemoveObserver(this);
   }
 
   // Overridden from WindowTreeHostManager::Observer
   void OnDisplayConfigurationChanging() override { ++changing_count_; }
   void OnDisplayConfigurationChanged() override { ++changed_count_; }
 
@@ skipping 73 matching lines @@
   int primary_changed_count_;
   int64_t changed_display_id_;
 
   int focus_changed_count_;
   int activation_changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 gfx::Display GetPrimaryDisplay() {
-  return Shell::GetScreen()->GetDisplayNearestWindow(
+  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
-  return Shell::GetScreen()->GetDisplayNearestWindow(
+  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[1]);
 }
 
 void SetSecondaryDisplayLayoutAndOffset(DisplayLayout::Position position,
                                         int offset) {
   DisplayLayout layout(position, offset);
-  ASSERT_GT(Shell::GetScreen()->GetNumDisplays(), 1);
+  ASSERT_GT(gfx::Screen::GetScreen()->GetNumDisplays(), 1);
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(layout);
 }
 
 void SetSecondaryDisplayLayout(DisplayLayout::Position position) {
   SetSecondaryDisplayLayoutAndOffset(position, 0);
 }
 
 void SetDefaultDisplayLayout(DisplayLayout::Position position) {
   Shell::GetInstance()
       ->display_manager()
       ->layout_store()
       ->SetDefaultDisplayLayout(DisplayLayout(position, 0));
 }
 
 class WindowTreeHostManagerShutdownTest : public test::AshTestBase {
  public:
   WindowTreeHostManagerShutdownTest() {}
   ~WindowTreeHostManagerShutdownTest() override {}
 
   void TearDown() override {
     test::AshTestBase::TearDown();
     if (!SupportsMultipleDisplays())
       return;
 
     // Make sure that primary display is accessible after shutdown.
-    gfx::Display primary = Shell::GetScreen()->GetPrimaryDisplay();
+    gfx::Display primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
     EXPECT_EQ("0,0 444x333", primary.bounds().ToString());
-    EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
+    EXPECT_EQ(2, gfx::Screen::GetScreen()->GetNumDisplays());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManagerShutdownTest);
 };
 
 class StartupHelper : public test::TestShellDelegate,
                       public WindowTreeHostManager::Observer {
  public:
   StartupHelper() : displays_initialized_(false) {}
@@ skipping 405 matching lines @@
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,400 300x300", GetSecondaryDisplay().bounds().ToString());
 
   UpdateDisplay("400x400");
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_LE(1, observer.GetFocusChangedCountAndReset());
   EXPECT_LE(1, observer.GetActivationChangedCountAndReset());
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
-  EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
+  EXPECT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
 
   UpdateDisplay("400x500*2,300x300");
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
-  ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
+  ASSERT_EQ(2, gfx::Screen::GetScreen()->GetNumDisplays());
   EXPECT_EQ("0,0 200x250", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,250 300x300", GetSecondaryDisplay().bounds().ToString());
 
   // No change
   UpdateDisplay("400x500*2,300x300");
   // We still call into Pre/PostDisplayConfigurationChange().
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ(0, observer.GetFocusChangedCountAndReset());
   EXPECT_EQ(0, observer.GetActivationChangedCountAndReset());
 
@@ skipping 46 matching lines @@
 
 TEST_F(WindowTreeHostManagerTest, SwapPrimary) {
   if (!SupportsMultipleDisplays())
     return;
 
   WindowTreeHostManager* window_tree_host_manager =
       Shell::GetInstance()->window_tree_host_manager();
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   UpdateDisplay("200x200,300x300");
-  gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display primary_display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenUtil::GetSecondaryDisplay();
 
   DisplayLayout display_layout(DisplayLayout::RIGHT, 50);
   display_manager->SetLayoutForCurrentDisplays(display_layout);
 
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::Window* primary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(primary_display.id());
   aura::Window* secondary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(
           secondary_display.id());
   EXPECT_NE(primary_root, secondary_root);
   aura::Window* shelf_window =
       Shelf::ForPrimaryDisplay()->shelf_widget()->GetNativeView();
   EXPECT_TRUE(primary_root->Contains(shelf_window));
   EXPECT_FALSE(secondary_root->Contains(shelf_window));
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
   EXPECT_EQ(primary_display.id(),
-            Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, -100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(NULL).id());
 
   EXPECT_EQ("0,0 200x200", primary_display.bounds().ToString());
   EXPECT_EQ("0,0 200x153", primary_display.work_area().ToString());
   EXPECT_EQ("200,0 300x300", secondary_display.bounds().ToString());
   EXPECT_EQ("200,0 300x253", secondary_display.work_area().ToString());
   EXPECT_EQ("right, 50", display_manager->GetCurrentDisplayLayout().ToString());
 
   // Switch primary and secondary
   window_tree_host_manager->SetPrimaryDisplay(secondary_display);
   const DisplayLayout& inverted_layout =
       display_manager->GetCurrentDisplayLayout();
   EXPECT_EQ("left, -50", inverted_layout.ToString());
 
   EXPECT_EQ(secondary_display.id(),
-            Shell::GetScreen()->GetPrimaryDisplay().id());
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenUtil::GetSecondaryDisplay().id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, -100))
+                .id());
   EXPECT_EQ(secondary_display.id(),
-            Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(NULL).id());
 
   EXPECT_EQ(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               secondary_display.id()));
   EXPECT_EQ(secondary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                                 primary_display.id()));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
   EXPECT_FALSE(secondary_root->Contains(shelf_window));
 
   // Test if the bounds are correctly swapped.
-  gfx::Display swapped_primary = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display swapped_primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   gfx::Display swapped_secondary = ScreenUtil::GetSecondaryDisplay();
   EXPECT_EQ("0,0 300x300", swapped_primary.bounds().ToString());
   EXPECT_EQ("0,0 300x253", swapped_primary.work_area().ToString());
   EXPECT_EQ("-200,-50 200x200", swapped_secondary.bounds().ToString());
 
   EXPECT_EQ("-200,-50 200x153", swapped_secondary.work_area().ToString());
 
   aura::WindowTracker tracker;
   tracker.Add(primary_root);
   tracker.Add(secondary_root);
 
   // Deleting 2nd display should move the primary to original primary display.
   UpdateDisplay("200x200");
   RunAllPendingInMessageLoop();  // RootWindow is deleted in a posted task.
-  EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ(primary_display.id(), Shell::GetScreen()->GetPrimaryDisplay().id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
   EXPECT_EQ(primary_display.id(),
-            Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, -100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(NULL).id());
   EXPECT_TRUE(tracker.Contains(primary_root));
   EXPECT_FALSE(tracker.Contains(secondary_root));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
 }
 
 TEST_F(WindowTreeHostManagerTest, FindNearestDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   WindowTreeHostManager* window_tree_host_manager =
       Shell::GetInstance()->window_tree_host_manager();
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   UpdateDisplay("200x200,300x300");
   DisplayLayout display_layout(DisplayLayout::RIGHT, 50);
   display_manager->SetLayoutForCurrentDisplays(display_layout);
 
-  gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display primary_display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenUtil::GetSecondaryDisplay();
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::Window* primary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(primary_display.id());
   aura::Window* secondary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(
           secondary_display.id());
   EXPECT_NE(primary_root, secondary_root);
 
   // Test that points outside of any display return the nearest display.
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, 0)).id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(0, -100)).id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(100, 100)).id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(224, 25)).id());
-  EXPECT_EQ(
-      secondary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(226, 25)).id());
-  EXPECT_EQ(
-      secondary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(600, 100)).id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(174, 225)).id());
-  EXPECT_EQ(
-      secondary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(176, 225)).id());
-  EXPECT_EQ(
-      secondary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(300, 400)).id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, 0))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(0, -100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(100, 100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(224, 25))
+                .id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(226, 25))
+                .id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(600, 100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(174, 225))
+                .id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(176, 225))
+                .id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(300, 400))
+                .id());
 }
 
 TEST_F(WindowTreeHostManagerTest, SwapPrimaryById) {
   if (!SupportsMultipleDisplays())
     return;
 
   WindowTreeHostManager* window_tree_host_manager =
       Shell::GetInstance()->window_tree_host_manager();
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   UpdateDisplay("200x200,300x300");
-  gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display primary_display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenUtil::GetSecondaryDisplay();
 
   DisplayLayout display_layout(DisplayLayout::RIGHT, 50);
   display_manager->SetLayoutForCurrentDisplays(display_layout);
 
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::Window* primary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(primary_display.id());
   aura::Window* secondary_root =
       window_tree_host_manager->GetRootWindowForDisplayId(
           secondary_display.id());
   aura::Window* shelf_window =
       Shelf::ForPrimaryDisplay()->shelf_widget()->GetNativeView();
   EXPECT_TRUE(primary_root->Contains(shelf_window));
   EXPECT_FALSE(secondary_root->Contains(shelf_window));
   EXPECT_NE(primary_root, secondary_root);
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
   EXPECT_EQ(primary_display.id(),
-            Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, -100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(NULL).id());
 
   // Switch primary and secondary by display ID.
   TestObserver observer;
   window_tree_host_manager->SetPrimaryDisplayId(secondary_display.id());
   EXPECT_EQ(secondary_display.id(),
-            Shell::GetScreen()->GetPrimaryDisplay().id());
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenUtil::GetSecondaryDisplay().id());
   EXPECT_LT(0, observer.CountAndReset());
 
   EXPECT_EQ(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               secondary_display.id()));
   EXPECT_EQ(secondary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                                 primary_display.id()));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
   EXPECT_FALSE(secondary_root->Contains(shelf_window));
 
   const DisplayLayout& inverted_layout =
       display_manager->GetCurrentDisplayLayout();
 
   EXPECT_EQ("left, -50", inverted_layout.ToString());
 
   // Calling the same ID don't do anything.
   window_tree_host_manager->SetPrimaryDisplayId(secondary_display.id());
   EXPECT_EQ(0, observer.CountAndReset());
 
   aura::WindowTracker tracker;
   tracker.Add(primary_root);
   tracker.Add(secondary_root);
 
   // Deleting 2nd display should move the primary to original primary display.
   UpdateDisplay("200x200");
   RunAllPendingInMessageLoop();  // RootWindow is deleted in a posted task.
-  EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ(primary_display.id(), Shell::GetScreen()->GetPrimaryDisplay().id());
-  EXPECT_EQ(
-      primary_display.id(),
-      Shell::GetScreen()->GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());
   EXPECT_EQ(primary_display.id(),
-            Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()
+                ->GetDisplayNearestPoint(gfx::Point(-100, -100))
+                .id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()->GetDisplayNearestWindow(NULL).id());
   EXPECT_TRUE(tracker.Contains(primary_root));
   EXPECT_FALSE(tracker.Contains(secondary_root));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
 
   // Adding 2nd display with the same ID.  The 2nd display should become primary
   // since secondary id is still stored as desirable_primary_id.
   std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(
       display_manager->GetDisplayInfo(primary_display.id()));
   display_info_list.push_back(
       display_manager->GetDisplayInfo(secondary_display.id()));
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
-  EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
+  EXPECT_EQ(2, gfx::Screen::GetScreen()->GetNumDisplays());
   EXPECT_EQ(secondary_display.id(),
-            Shell::GetScreen()->GetPrimaryDisplay().id());
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenUtil::GetSecondaryDisplay().id());
   EXPECT_EQ(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               secondary_display.id()));
   EXPECT_NE(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               primary_display.id()));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
 
   // Deleting 2nd display and adding 2nd display with a different ID.  The 2nd
   // display shouldn't become primary.
   UpdateDisplay("200x200");
   DisplayInfo third_display_info(secondary_display.id() + 1, std::string(),
                                  false);
   third_display_info.SetBounds(secondary_display.bounds());
   ASSERT_NE(primary_display.id(), third_display_info.id());
 
   const DisplayInfo& primary_display_info =
       display_manager->GetDisplayInfo(primary_display.id());
   std::vector<DisplayInfo> display_info_list2;
   display_info_list2.push_back(primary_display_info);
   display_info_list2.push_back(third_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list2);
-  EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ(primary_display.id(), Shell::GetScreen()->GetPrimaryDisplay().id());
+  EXPECT_EQ(2, gfx::Screen::GetScreen()->GetNumDisplays());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(third_display_info.id(), ScreenUtil::GetSecondaryDisplay().id());
   EXPECT_EQ(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               primary_display.id()));
   EXPECT_NE(primary_root, window_tree_host_manager->GetRootWindowForDisplayId(
                               third_display_info.id()));
   EXPECT_TRUE(primary_root->Contains(shelf_window));
 }
 
 TEST_F(WindowTreeHostManagerTest, OverscanInsets) {
   if (!SupportsMultipleDisplays())
     return;
 
   WindowTreeHostManager* window_tree_host_manager =
       Shell::GetInstance()->window_tree_host_manager();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("120x200,300x400*2");
-  gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   window_tree_host_manager->SetOverscanInsets(display1.id(),
                                               gfx::Insets(10, 15, 20, 25));
   EXPECT_EQ("0,0 80x170", root_windows[0]->bounds().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("80,0 150x200",
             ScreenUtil::GetSecondaryDisplay().bounds().ToString());
 
   ui::test::EventGenerator generator(root_windows[0]);
@@ skipping 28 matching lines @@
 
 TEST_F(WindowTreeHostManagerTest, Rotate) {
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("120x200,300x400*2");
-  gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   int64_t display2_id = ScreenUtil::GetSecondaryDisplay().id();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ui::test::EventGenerator generator1(root_windows[0]);
 
   TestObserver observer;
   EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("120,0 150x200",
             ScreenUtil::GetSecondaryDisplay().bounds().ToString());
   generator1.MoveMouseToInHost(50, 40);
@@ skipping 54 matching lines @@
 
 TEST_F(WindowTreeHostManagerTest, ScaleRootWindow) {
   if (!SupportsMultipleDisplays())
     return;
 
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2@1.5,500x300");
 
-  gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   test::ScopedSetInternalDisplayId set_internal(display1.id());
 
   gfx::Display display2 = ScreenUtil::GetSecondaryDisplay();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 450x300", display1.bounds().ToString());
   EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString());
   EXPECT_EQ("450,0 500x300", display2.bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
   EXPECT_EQ(1.0f, GetStoredUIScale(display2.id()));
 
   ui::test::EventGenerator generator(root_windows[0]);
   generator.MoveMouseToInHost(599, 200);
   EXPECT_EQ("449,150", event_handler.GetLocationAndReset());
 
   SetDisplayUIScale(display1.id(), 1.25f);
-  display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   display2 = ScreenUtil::GetSecondaryDisplay();
   EXPECT_EQ("0,0 375x250", display1.bounds().ToString());
   EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString());
   EXPECT_EQ("375,0 500x300", display2.bounds().ToString());
   EXPECT_EQ(1.25f, GetStoredUIScale(display1.id()));
   EXPECT_EQ(1.0f, GetStoredUIScale(display2.id()));
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 TEST_F(WindowTreeHostManagerTest, TouchScale) {
   if (!SupportsMultipleDisplays())
     return;
 
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("200x200*2");
-  gfx::Display display = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::Window* root_window = root_windows[0];
   ui::test::EventGenerator generator(root_window);
 
   generator.PressMoveAndReleaseTouchTo(50, 50);
   // Default test touches have radius_x/y = 1.0, with device scale
   // factor = 2, the scaled radius_x/y should be 0.5.
   EXPECT_EQ(0.5, event_handler.touch_radius_x());
   EXPECT_EQ(0.5, event_handler.touch_radius_y());
 
@@ skipping 12 matching lines @@
 
 TEST_F(WindowTreeHostManagerTest, ConvertHostToRootCoords) {
   if (!SupportsMultipleDisplays())
     return;
 
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2/r@1.5");
 
-  gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Display display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
   EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
   ui::test::EventGenerator generator(root_windows[0]);
   generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("0,449", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("299,0", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("299,449", event_handler.GetLocationAndReset());
 
   UpdateDisplay("600x400*2/u@1.5");
-  display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 450x300", display1.bounds().ToString());
   EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
   generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("449,299", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("0,299", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("449,0", event_handler.GetLocationAndReset());
 
   UpdateDisplay("600x400*2/l@1.5");
-  display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  display1 = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
   EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
   generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("299,0", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("299,449", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(599, 399);
@@ skipping 63 matching lines @@
       CreateDisplayInfo(11, 1, gfx::Display::ROTATE_0);
 
   std::vector<DisplayInfo> display_info_list;
   // Extended
   display_info_list.push_back(first_display_info);
   display_info_list.push_back(second_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
   Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
 
-  EXPECT_EQ(11, Shell::GetScreen()->GetPrimaryDisplay().id());
+  EXPECT_EQ(11, gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
 
   display_info_list.clear();
   const DisplayInfo new_first_display_info =
       CreateDisplayInfo(20, 0, gfx::Display::ROTATE_0);
   const DisplayInfo new_second_display_info =
       CreateDisplayInfo(21, 1, gfx::Display::ROTATE_0);
   display_info_list.push_back(new_first_display_info);
   display_info_list.push_back(new_second_display_info);
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
-  EXPECT_EQ(20, Shell::GetScreen()->GetPrimaryDisplay().id());
+  EXPECT_EQ(20, gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
 }
 
 namespace {
 
 class RootWindowTestObserver : public aura::WindowObserver {
  public:
   RootWindowTestObserver() {}
   ~RootWindowTestObserver() override {}
 
   void OnWindowBoundsChanged(aura::Window* window,
@@ skipping 227 matching lines @@
       widget->GetNativeWindow()->GetRootWindow());
   event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());
 
   UpdateDisplay("300x300");
   watcher.Stop();
 
   widget->CloseNow();
 }
 
 }  // namespace ash