Fix namespace for src/ui/display/.

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 25 matching lines @@
                 const std::vector<MONITORINFOEX>& monitor_infos,
                 const std::unordered_map<HWND, gfx::Rect>& hwnd_map)
       : monitor_infos_(monitor_infos),
         hwnd_map_(hwnd_map) {
     UpdateFromDisplayInfos(display_infos);
   }
 
   ~TestScreenWin() override = default;
 
  protected:
-  // display::win::ScreenWin:
+  // win::ScreenWin:
   HWND GetHWNDFromNativeView(gfx::NativeView window) const override {
     // NativeView is only used as an identifier in this tests, so interchange
     // NativeView with an HWND for convenience.
     return reinterpret_cast<HWND>(window);
   }
 
   gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const override {
     // NativeWindow is only used as an identifier in this tests, so interchange
     // an HWND for a NativeWindow for convenience.
     return reinterpret_cast<gfx::NativeWindow>(hwnd);
@@ skipping 93 matching lines @@
  public:
   TestScreenWinManager() = default;
 
   ~TestScreenWinManager() { Screen::SetScreenInstance(nullptr); }
 
   void AddMonitor(const gfx::Rect& pixel_bounds,
                   const gfx::Rect& pixel_work,
                   const wchar_t* device_name,
                   float device_scale_factor) override {
     MONITORINFOEX monitor_info =
-        display::win::test::CreateMonitorInfo(pixel_bounds,
-                                              pixel_work,
-                                              device_name);
+        win::test::CreateMonitorInfo(pixel_bounds, pixel_work, device_name);
     monitor_infos_.push_back(monitor_info);
     display_infos_.push_back(DisplayInfo(monitor_info, device_scale_factor,
                                          Display::ROTATE_0));
   }
 
   HWND CreateFakeHwnd(const gfx::Rect& bounds) override {
     EXPECT_EQ(screen_win_, nullptr);
     hwnd_map_.insert(std::pair<HWND, gfx::Rect>(++hwndLast_, bounds));
     return hwndLast_;
   }
@@ skipping 3212 matching lines @@
  public:
   ScreenWinUninitializedForced1x() = default;
 
   void SetUp() override {
     testing::Test::SetUp();
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kForceDeviceScaleFactor, "1");
   }
 
   void TearDown() override {
-    display::Display::ResetForceDeviceScaleFactorForTesting();
+    Display::ResetForceDeviceScaleFactorForTesting();
     testing::Test::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenWinUninitializedForced1x);
 };
 
 }  // namespace
 
 TEST_F(ScreenWinUninitializedForced1x, ScreenToDIPPoints) {
@@ skipping 93 matching lines @@
  public:
   ScreenWinUninitializedForced2x() = default;
 
   void SetUp() override {
     testing::Test::SetUp();
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kForceDeviceScaleFactor, "2");
   }
 
   void TearDown() override {
-    display::Display::ResetForceDeviceScaleFactorForTesting();
+    Display::ResetForceDeviceScaleFactorForTesting();
     testing::Test::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenWinUninitializedForced2x);
 };
 
 }  // namespace
 
 TEST_F(ScreenWinUninitializedForced2x, ScreenToDIPPoints) {
@@ skipping 79 matching lines @@
   // this test is to make sure we don't crash.
   ScreenWin::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
 }
 
 TEST_F(ScreenWinUninitializedForced2x, GetScaleFactorForHWND) {
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(nullptr));
 }
 
 }  // namespace win
 }  // namespace display