Merge to 2062: Force scales 125% and lower down to 100%

ui/gfx/win/dpi.cc

Index: ui/gfx/win/dpi.cc
diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc
index e562a086c9a151018f78bbffc92adf177796d501..e93a38d8bd00cee34c1fae4fc8007d56709d6d57 100644
--- a/ui/gfx/win/dpi.cc
+++ b/ui/gfx/win/dpi.cc
@@ -134,6 +134,11 @@ Size GetDPI() {
 
 float GetDPIScale() {
   if (IsHighDPIEnabled()) {
+    if (GetDPI().width() <= 120) {
+      // 120 logical pixels is 125% scale. We do this to maintain previous
+      // (non-DPI-aware) behavior where only the font size was boosted.
+      return 1.0;
+    }
     return gfx::Display::HasForceDeviceScaleFactor() ?
         gfx::Display::GetForcedDeviceScaleFactor() :
         GetUnforcedDeviceScaleFactor();