COMPLETED PREVIEW Migrate to Display Placement

ui/gfx/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/gfx/screen_win.h"
 
 #include <windows.h>
 #include <inttypes.h>
 #include <stddef.h>
 
 #include <cwchar>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/switches.h"
 #include "ui/gfx/test/display_util.h"
+#include "ui/gfx/test/screen_util_win.h"
 #include "ui/gfx/win/display_info.h"
 #include "ui/gfx/win/dpi.h"
 #include "ui/gfx/win/screen_win_display.h"
 
 namespace gfx {
 
 namespace {
 
-MONITORINFOEX CreateMonitorInfo(gfx::Rect monitor,
-                                gfx::Rect work,
-                                std::wstring device_name) {
-  MONITORINFOEX monitor_info;
-  ::ZeroMemory(&monitor_info, sizeof(monitor_info));
-  monitor_info.cbSize = sizeof(monitor_info);
-  monitor_info.rcMonitor = monitor.ToRECT();
-  monitor_info.rcWork = work.ToRECT();
-  size_t device_char_count = ARRAYSIZE(monitor_info.szDevice);
-  wcsncpy(monitor_info.szDevice, device_name.c_str(), device_char_count);
-  monitor_info.szDevice[device_char_count-1] = L'\0';
-  return monitor_info;
-}
-
 class TestScreenWin : public gfx::ScreenWin {
  public:
   TestScreenWin(const std::vector<gfx::win::DisplayInfo>& display_infos,
                 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);
   }
 
@@ skipping 94 matching lines @@
   TestScreenWinManager() = default;
 
   ~TestScreenWinManager() {
     gfx::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 = CreateMonitorInfo(pixel_bounds,
-                                                   pixel_work,
-                                                   device_name);
+    MONITORINFOEX monitor_info = gfx::test::CreateMonitorInfo(pixel_bounds,
+                                                              pixel_work,
+                                                              device_name);
     monitor_infos_.push_back(monitor_info);
     display_infos_.push_back(gfx::win::DisplayInfo(monitor_info,
                                                    device_scale_factor,
                                                    gfx::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 1819 matching lines @@
   EXPECT_EQ(gfx::Size(21, 66),
             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 gfx