Rename gfx::Display/Screen to display::Display/Screen in ui/display, ui/ozon

ui/display/win/screen_win_unittest.cc

 // Copyright 2015 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 "ui/display/win/screen_win.h"
 
 #include <windows.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ skipping 1550 matching lines @@
  public:
   ScreenWinUninitializedForced1x() = default;
 
   void SetUp() override {
     testing::Test::SetUp();
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kForceDeviceScaleFactor, "1");
   }
 
   void TearDown() override {
-    gfx::Display::ResetForceDeviceScaleFactorForTesting();
+    display::Display::ResetForceDeviceScaleFactorForTesting();
     testing::Test::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenWinUninitializedForced1x);
 };
 
 }  // namespace
 
 TEST_F(ScreenWinUninitializedForced1x, ScreenToDIPPoints) {
@@ skipping 77 matching lines @@
  public:
   ScreenWinUninitializedForced2x() = default;
 
   void SetUp() override {
     testing::Test::SetUp();
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kForceDeviceScaleFactor, "2");
   }
 
   void TearDown() override {
-    gfx::Display::ResetForceDeviceScaleFactorForTesting();
+    display::Display::ResetForceDeviceScaleFactorForTesting();
     testing::Test::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenWinUninitializedForced2x);
 };
 
 }  // namespace
 
 TEST_F(ScreenWinUninitializedForced2x, ScreenToDIPPoints) {
@@ skipping 63 matching lines @@
             ScreenWin::ScreenToDIPSize(nullptr, gfx::Size(42, 131)));
 }
 
 TEST_F(ScreenWinUninitializedForced2x, DIPToScreenSize) {
   EXPECT_EQ(gfx::Size(42, 132),
             ScreenWin::DIPToScreenSize(nullptr, gfx::Size(21, 66)));
 }
 
 }  // namespace win
 }  // namespace display