Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

chrome/browser/extensions/display_info_provider_win.cc

Index: chrome/browser/extensions/display_info_provider_win.cc
diff --git a/chrome/browser/extensions/display_info_provider_win.cc b/chrome/browser/extensions/display_info_provider_win.cc
index 8ddfbc075070c52971a354a41f92a72160562487..e38c983558b19ef674ee6f17bef6c79b5fce4583 100644
--- a/chrome/browser/extensions/display_info_provider_win.cc
+++ b/chrome/browser/extensions/display_info_provider_win.cc
@@ -38,12 +38,9 @@ EnumMonitorCallback(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM data) {
   if (!EnumDisplayDevices(monitor_info.szDevice, 0, &device, 0))
     return FALSE;
 
-  gfx::Size dpi(gfx::GetDPI());
   unit->id =
       base::Int64ToString(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
   unit->name = base::WideToUTF8(device.DeviceString);
-  unit->dpi_x = dpi.width();
-  unit->dpi_y = dpi.height();
   all_displays->push_back(unit);
 
   return TRUE;
@@ -74,8 +71,9 @@ void DisplayInfoProviderWin::UpdateDisplayUnitInfoForPlatform(
   for (size_t i = 0; i < all_displays.size(); ++i) {
     if (unit->id == all_displays[i]->id) {
       unit->name = all_displays[i]->name;
-      unit->dpi_x = all_displays[i]->dpi_x;
-      unit->dpi_y = all_displays[i]->dpi_y;
+      int dpi = gfx::GetDPIFromScalingFactor(display.device_scale_factor());
+      unit->dpi_x = dpi;
+      unit->dpi_y = dpi;
       break;
     }
   }