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

ui/base/l10n/l10n_util_win.cc

Index: ui/base/l10n/l10n_util_win.cc
diff --git a/ui/base/l10n/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc
index cd5b519d1de9bf4553f5476d0b471773ef8d7096..9b61030b9a0dd8ceb773f3015510ecd969be762d 100644
--- a/ui/base/l10n/l10n_util_win.cc
+++ b/ui/base/l10n/l10n_util_win.cc
@@ -155,12 +155,10 @@ bool NeedOverrideDefaultUIFont(base::string16* override_font_family,
 }
 
 void AdjustUIFont(LOGFONT* logfont) {
-  float dpi_scale = display::win::GetDPIScale();
-  if (display::Display::HasForceDeviceScaleFactor()) {
-    // If the scale is forced, we don't need to adjust it here.
-    dpi_scale = 1.0f;
-  }
-  AdjustUIFontForDIP(dpi_scale, logfont);
+  // Use the unforced scale so the font will be normalized to the correct DIP
+  // value. That way it'll appear the right size when the forced scale is
+  // applied later (when coverting to pixels).
+  AdjustUIFontForDIP(display::win::GetUnforcedDeviceScaleFactor(), logfont);

[robliao, 2017/02/13 17:57:33]

Just to make sure I understand this correctly, the issue here is that the font
system completely works in pixels and we perform a conversion to make things DIP
in views, correct?

If that's the case, then I don't see an alternative other than to provide the
actual DPI to the font system. See comment on display.

[Bret, 2017/02/14 20:29:20]

Our font system works in DIPs, as expected. This value is coming from Windows,
so it's in pixels.

I'm not sure what comment you're referring to.

[robliao, 2017/02/14 20:43:09]

That's fun. I think what I meant to say is let's pipe this through display. 

display::Display already provides the forced DPI, it stands to reason that it
should also provide the unforced one if someone really needs it.

 }
 
 void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont) {