Make ash::DisplayMode more like ui::DisplayMode

ash/touch/touchscreen_util_unittest.cc

Index: ash/touch/touchscreen_util_unittest.cc
diff --git a/ash/touch/touchscreen_util_unittest.cc b/ash/touch/touchscreen_util_unittest.cc
index adfc23636ae36b114c509480db684795fc8fb81a..9b6854473475e99256cdff630591316c54d30309 100644
--- a/ash/touch/touchscreen_util_unittest.cc
+++ b/ash/touch/touchscreen_util_unittest.cc
@@ -26,18 +26,22 @@ class TouchscreenUtilTest : public test::AshTestBase {
     // with matching size.
     {
       DisplayInfo display(1, "1", false);
-      DisplayMode mode(gfx::Size(1920, 1080), 60.0, false, true);
-      mode.native = true;
-      std::vector<DisplayMode> modes(1, mode);
+      scoped_refptr<DisplayMode> mode(
+          new DisplayMode(gfx::Size(1920, 1080), 60.0, false /* interlaced */,
+                          true /* native */, 1.0 /* ui_scale */,
+                          1.0 /* device_scale_factor */));
+      DisplayInfo::DisplayModeList modes(1, mode);
       display.SetDisplayModes(modes);
       displays_.push_back(display);
     }
 
     {
       DisplayInfo display(2, "2", false);
-      DisplayMode mode(gfx::Size(800, 600), 60.0, false, true);
-      mode.native = true;
-      std::vector<DisplayMode> modes(1, mode);
+
+      scoped_refptr<DisplayMode> mode(new DisplayMode(
+          gfx::Size(800, 600), 60.0, false /* interlaced */, true /* native */,
+          1.0 /* ui_scale */, 1.0 /* device_scale_factor */));
+      DisplayInfo::DisplayModeList modes(1, mode);
       display.SetDisplayModes(modes);
       displays_.push_back(display);
     }
@@ -50,9 +54,12 @@ class TouchscreenUtilTest : public test::AshTestBase {
 
     {
       DisplayInfo display(4, "4", false);
-      DisplayMode mode(gfx::Size(1024, 768), 60.0, false, true);
-      mode.native = true;
-      std::vector<DisplayMode> modes(1, mode);
+
+      scoped_refptr<DisplayMode> mode(
+          new DisplayMode(gfx::Size(1024, 768), 60.0, false /* interlaced */,
+                          /* native */ true, 1.0 /* ui_scale */,
+                          1.0 /* device_scale_factor */));
+      DisplayInfo::DisplayModeList modes(1, mode);
       display.SetDisplayModes(modes);
       displays_.push_back(display);
     }