Make ash::DisplayMode more like ui::DisplayMode

ash/touch/touchscreen_util_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "ash/common/display/display_info.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/touch/touchscreen_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/devices/input_device.h"
 
 namespace ash {
 
 class TouchscreenUtilTest : public test::AshTestBase {
  public:
   TouchscreenUtilTest() {}
   ~TouchscreenUtilTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     // Internal display will always match to internal touchscreen. If internal
     // touchscreen can't be detected, it is then associated to a touch screen
     // 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);
     }
 
     // Display without native mode. Must not be matched to any touch screen.
     {
       DisplayInfo display(3, "3", false);
       displays_.push_back(display);
     }
 
     {
       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);
     }
   }
 
   void TearDown() override {
     displays_.clear();
     test::AshTestBase::TearDown();
   }
 
@@ skipping 191 matching lines @@
   AssociateTouchscreens(&displays_, devices);
 
   EXPECT_EQ(1u, displays_[0].input_devices().size());
   EXPECT_EQ(1, displays_[0].input_devices()[0]);
   EXPECT_EQ(0u, displays_[1].input_devices().size());
   EXPECT_EQ(0u, displays_[2].input_devices().size());
   EXPECT_EQ(0u, displays_[3].input_devices().size());
 }
 
 }  // namespace ash