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

chrome/browser/ui/autofill/popup_view_common_unittest.cc

 // Copyright 2016 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/ui/autofill/popup_view_common.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #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 {
 
 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
 
 class PopupViewCommonTest : public ChromeRenderViewHostTestHarness {
  public:
   PopupViewCommonTest() {}
   ~PopupViewCommonTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PopupViewCommonTest);
 };
 
 TEST_F(PopupViewCommonTest, CalculatePopupBounds) {
   int desired_width = 40;
   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 {
     gfx::Rect element_bounds;
     gfx::Rect expected_popup_bounds_ltr;
     // Non-empty only when it differs from the ltr expectation.
     gfx::Rect expected_popup_bounds_rtl;
   } test_cases[] = {
       // The popup grows down and to the end.
       {gfx::Rect(38, 0, 5, 0), gfx::Rect(38, 0, desired_width, desired_height),
@@ skipping 36 matching lines @@
         web_contents()->GetNativeView(), /* is_rtl= */ true);
     gfx::Rect expected_popup_bounds = test_cases[i].expected_popup_bounds_rtl;
     if (expected_popup_bounds.IsEmpty())
       expected_popup_bounds = test_cases[i].expected_popup_bounds_ltr;
     EXPECT_EQ(expected_popup_bounds.ToString(), actual_popup_bounds.ToString())
         << "Popup bounds failed to match for rtl test " << i;
   }
 }
 
 }  // namespace autofill