Create ScreenWin::GetSystemMetricsInDIP and Correctly Deprecate display::win::GetSystemMetricsInDIP

ui/display/win/screen_win_unittest.cc

Index: ui/display/win/screen_win_unittest.cc
diff --git a/ui/display/win/screen_win_unittest.cc b/ui/display/win/screen_win_unittest.cc
index 2c654efd0ed3c7824a5b4eeeb8dc6081dee3ec20..2765c56dd8db361cce9d228fb6179924d2454e16 100644
--- a/ui/display/win/screen_win_unittest.cc
+++ b/ui/display/win/screen_win_unittest.cc
@@ -337,6 +337,11 @@ TEST_F(ScreenWinTestSingleDisplay1x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestSingleDisplay1x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestSingleDisplay1x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
 }
@@ -499,6 +504,11 @@ TEST_F(ScreenWinTestSingleDisplay1_25x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestSingleDisplay1_25x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(25, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(34, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestSingleDisplay1_25x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.25, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
 }
@@ -650,6 +660,11 @@ TEST_F(ScreenWinTestSingleDisplay1_5x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestSingleDisplay1_5x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestSingleDisplay1_5x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
 }
@@ -801,6 +816,11 @@ TEST_F(ScreenWinTestSingleDisplay2x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestSingleDisplay2x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestSingleDisplay2x, GetScaleFactorForHWND) {
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
 }
@@ -1016,6 +1036,11 @@ TEST_F(ScreenWinTestTwoDisplays1x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays1x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays1x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -1280,6 +1305,11 @@ TEST_F(ScreenWinTestTwoDisplays2x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays2x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays2x, GetScaleFactorForHWND) {
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -1652,6 +1682,11 @@ TEST_F(ScreenWinTestManyDisplays1x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestManyDisplays1x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestManyDisplays1x, GetScaleFactorForHWND) {
   for (size_t i = 0; i < 5u; ++i) {
     SCOPED_TRACE(base::StringPrintf("i=%zu", i));
@@ -2085,6 +2120,11 @@ TEST_F(ScreenWinTestManyDisplays2x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestManyDisplays2x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestManyDisplays2x, GetScaleFactorForHWND) {
   for (size_t i = 0; i < 5u; ++i) {
     SCOPED_TRACE(base::StringPrintf("i=%zu", i));
@@ -2382,6 +2422,11 @@ TEST_F(ScreenWinTestTwoDisplays1x2x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays1x2x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays1x2x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -2654,6 +2699,11 @@ TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -2922,6 +2972,11 @@ TEST_F(ScreenWinTestTwoDisplays2x1x, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays2x1x, GetSystemMetricsInDIP) {
+  EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays2x1x, GetScaleFactorForHWND) {
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -3195,6 +3250,11 @@ TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetSystemMetricsForHwnd) {
   EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
 }
 
+TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetSystemMetricsInDIP) {
+  EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
+  EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
+}
+
 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetScaleFactorForHWND) {
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
   EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
@@ -3374,6 +3434,12 @@ TEST_F(ScreenWinUninitializedForced1x, GetSystemMetricsForHwnd) {
   ScreenWin::GetSystemMetricsForHwnd(nullptr, SM_CXSIZEFRAME);
 }
 
+TEST_F(ScreenWinUninitializedForced1x, GetSystemMetricsInDIP) {
+  // GetSystemMetricsInDIP falls back to the system's GetSystemMetrics, so this
+  // test is to make sure we don't crash.
+  ScreenWin::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
+}
+
 TEST_F(ScreenWinUninitializedForced1x, GetScaleFactorForHWND) {
   EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(nullptr));
 }
@@ -3480,6 +3546,12 @@ TEST_F(ScreenWinUninitializedForced2x, GetSystemMetricsForHwnd) {
   ScreenWin::GetSystemMetricsForHwnd(nullptr, SM_CXSIZEFRAME);
 }
 
+TEST_F(ScreenWinUninitializedForced2x, GetSystemMetricsInDIP) {
+  // GetSystemMetricsForHwnd falls back to the system's GetSystemMetrics, so
+  // 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));
 }