Make ash::DisplayMode more like ui::DisplayMode

chrome/browser/chromeos/display/display_preferences.cc

Index: chrome/browser/chromeos/display/display_preferences.cc
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index a05e3673eeffaf9623e590ebb2404923592231c0..2ae81319e3fdf1aa6126a189b0f2bc0bc67b351e 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -266,15 +266,14 @@ void StoreCurrentDisplayProperties() {
     property_value->SetInteger(
         "ui-scale", static_cast<int>(info.configured_ui_scale() * 1000));
 
-    ash::DisplayMode mode;
-    if (!display.IsInternal() &&
-        display_manager->GetSelectedModeForDisplayId(id, &mode) &&
-        !mode.native) {
-      property_value->SetInteger("width", mode.size.width());
-      property_value->SetInteger("height", mode.size.height());
+    scoped_refptr<ash::DisplayMode> mode =
+        display_manager->GetSelectedModeForDisplayId(id);
+    if (!display.IsInternal() && mode && !mode->native()) {
+      property_value->SetInteger("width", mode->size().width());
+      property_value->SetInteger("height", mode->size().height());
       property_value->SetInteger(
           "device-scale-factor",
-          static_cast<int>(mode.device_scale_factor * 1000));
+          static_cast<int>(mode->device_scale_factor() * 1000));
     }
     if (!info.overscan_insets_in_dip().IsEmpty())
       InsetsToValue(info.overscan_insets_in_dip(), property_value.get());