Fix font sizes being incorrect when using --force-device-scale-factor.

ui/display/win/screen_win.cc

 // Copyright (c) 2012 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 <shellscalingapi.h>
 
 #include <algorithm>
@@ skipping 333 matching lines @@
   if (!g_screen_win_instance)
     return ScreenWinDisplay().display().device_scale_factor();
 
   DCHECK(hwnd);
   HWND rootHwnd = g_screen_win_instance->GetRootWindow(hwnd);
   ScreenWinDisplay screen_win_display =
       g_screen_win_instance->GetScreenWinDisplayNearestHWND(rootHwnd);
   return screen_win_display.display().device_scale_factor();
 }
 
+// static
+float ScreenWin::GetSystemScaleFactor() {
+  return GetUnforcedDeviceScaleFactor();
+}
+
 HWND ScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
   NOTREACHED();
   return nullptr;
 }
 
 gfx::NativeWindow ScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
   NOTREACHED();
   return nullptr;
 }
 
@@ skipping 223 matching lines @@
     if (std::find(unique_scale_factors.begin(), unique_scale_factors.end(),
                   reported_scale) == unique_scale_factors.end()) {
       unique_scale_factors.push_back(reported_scale);
       UMA_HISTOGRAM_SPARSE_SLOWLY("UI.DeviceScale", reported_scale);
     }
   }
 }
 
 }  // namespace win
 }  // namespace display