Rename gfx::Display/Screen to display::Display/Screen in ui/views

ui/views/mus/screen_mus_unittest.cc

Index: ui/views/mus/screen_mus_unittest.cc
diff --git a/ui/views/mus/screen_mus_unittest.cc b/ui/views/mus/screen_mus_unittest.cc
index fe80a72baa52da4eee32b9dd3c859d08f5faa3e8..6c93020c2ec6ff2478c291b476cc2400f43e66ab 100644
--- a/ui/views/mus/screen_mus_unittest.cc
+++ b/ui/views/mus/screen_mus_unittest.cc
@@ -5,7 +5,7 @@
 #include "ui/views/mus/screen_mus.h"
 
 #include "base/command_line.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/switches.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/test/scoped_views_test_helper.h"
@@ -19,10 +19,10 @@ TEST(ScreenMusTest, ConsistentDisplayInHighDPI) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kForceDeviceScaleFactor, "2");
   ScopedViewsTestHelper test_helper;
-  gfx::Screen* screen = gfx::Screen::GetScreen();
-  std::vector<gfx::Display> displays = screen->GetAllDisplays();
+  display::Screen* screen = display::Screen::GetScreen();
+  std::vector<display::Display> displays = screen->GetAllDisplays();
   ASSERT_FALSE(displays.empty());
-  for (const gfx::Display& display : displays) {
+  for (const display::Display& display : displays) {
     EXPECT_EQ(2.f, display.device_scale_factor());
     EXPECT_EQ(display.work_area(), display.bounds());
   }