Rename gfx::Display/Screen to display::Display/Screen in chrome

chrome/browser/ui/autofill/popup_view_common_unittest.cc

Index: chrome/browser/ui/autofill/popup_view_common_unittest.cc
diff --git a/chrome/browser/ui/autofill/popup_view_common_unittest.cc b/chrome/browser/ui/autofill/popup_view_common_unittest.cc
index a71c25f9d426e14a264db304e701be145844a763..003d37dd254b67f6f1187034348a093e61467967 100644
--- a/chrome/browser/ui/autofill/popup_view_common_unittest.cc
+++ b/chrome/browser/ui/autofill/popup_view_common_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace autofill {
@@ -21,16 +21,17 @@ namespace {
 // Test class which overrides specific behavior for testing.
 class TestPopupViewCommon : public PopupViewCommon {
  public:
-  explicit TestPopupViewCommon(const gfx::Display& display)
+  explicit TestPopupViewCommon(const display::Display& display)
       : display_(display) {}
 
-  gfx::Display GetDisplayNearestPoint(const gfx::Point& point,
-                                      gfx::NativeView container_view) override {
+  display::Display GetDisplayNearestPoint(
+      const gfx::Point& point,
+      gfx::NativeView container_view) override {
     return display_;
   }
 
  private:
-  gfx::Display display_;
+  display::Display display_;
 };
 
 }  // namespace
@@ -49,8 +50,8 @@ TEST_F(PopupViewCommonTest, CalculatePopupBounds) {
   int desired_height = 16;
 
   // Set up the visible screen space.
-  gfx::Display display(0,
-                       gfx::Rect(0, 0, 2 * desired_width, 2 * desired_height));
+  display::Display display(
+      0, gfx::Rect(0, 0, 2 * desired_width, 2 * desired_height));
   TestPopupViewCommon view_common(display);
 
   struct {