Make ash::DisplayMode more like ui::DisplayMode

ash/common/display/display_info_unittest.cc

 // Copyright (c) 2013 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 "ash/common/display/display_info.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 namespace {
 
 std::string GetModeSizeInDIP(const gfx::Size& size,
                              float device_scale_factor,
                              float ui_scale,
                              bool is_internal) {
-  DisplayMode mode;
-  mode.size = size;
-  mode.device_scale_factor = device_scale_factor;
-  mode.ui_scale = ui_scale;
-  return mode.GetSizeInDIP(is_internal).ToString();
+  scoped_refptr<DisplayMode> mode =
+      new DisplayMode(size,
+                      /* refresh_rate */ 0.0,
+                      /* interlaced */ false,
+                      /* native */ false, ui_scale, device_scale_factor);
+  return mode->GetSizeInDIP(is_internal).ToString();
 }
 
 }  // namespace
 
 typedef testing::Test DisplayInfoTest;
 
 TEST_F(DisplayInfoTest, CreateFromSpec) {
   DisplayInfo info = DisplayInfo::CreateFromSpecWithID("200x100", 10);
   EXPECT_EQ(10, info.id());
   EXPECT_EQ("0,0 200x100", info.bounds_in_native().ToString());
@@ skipping 25 matching lines @@
   EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
   EXPECT_EQ(display::Display::ROTATE_270, info.GetActiveRotation());
   EXPECT_EQ(1.5f, info.configured_ui_scale());
 
   info = DisplayInfo::CreateFromSpecWithID(
       "200x200#300x200|200x200%59.9|100x100%60|150x100*2|150x150*1.25%30", 10);
 
   EXPECT_EQ("0,0 200x200", info.bounds_in_native().ToString());
   EXPECT_EQ(5u, info.display_modes().size());
   // Modes are sorted in DIP for external display.
-  EXPECT_EQ("150x100", info.display_modes()[0].size.ToString());
-  EXPECT_EQ("100x100", info.display_modes()[1].size.ToString());
-  EXPECT_EQ("150x150", info.display_modes()[2].size.ToString());
-  EXPECT_EQ("200x200", info.display_modes()[3].size.ToString());
-  EXPECT_EQ("300x200", info.display_modes()[4].size.ToString());
+  EXPECT_EQ("150x100", info.display_modes()[0]->size().ToString());
+  EXPECT_EQ("100x100", info.display_modes()[1]->size().ToString());
+  EXPECT_EQ("150x150", info.display_modes()[2]->size().ToString());
+  EXPECT_EQ("200x200", info.display_modes()[3]->size().ToString());
+  EXPECT_EQ("300x200", info.display_modes()[4]->size().ToString());
 
-  EXPECT_EQ(0.0f, info.display_modes()[0].refresh_rate);
-  EXPECT_EQ(60.0f, info.display_modes()[1].refresh_rate);
-  EXPECT_EQ(30.0f, info.display_modes()[2].refresh_rate);
-  EXPECT_EQ(59.9f, info.display_modes()[3].refresh_rate);
-  EXPECT_EQ(0.0f, info.display_modes()[4].refresh_rate);
+  EXPECT_EQ(0.0f, info.display_modes()[0]->refresh_rate());
+  EXPECT_EQ(60.0f, info.display_modes()[1]->refresh_rate());
+  EXPECT_EQ(30.0f, info.display_modes()[2]->refresh_rate());
+  EXPECT_EQ(59.9f, info.display_modes()[3]->refresh_rate());
+  EXPECT_EQ(0.0f, info.display_modes()[4]->refresh_rate());
 
-  EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
-  EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor);
-  EXPECT_EQ(1.25f, info.display_modes()[2].device_scale_factor);
-  EXPECT_EQ(1.0f, info.display_modes()[3].device_scale_factor);
-  EXPECT_EQ(1.0f, info.display_modes()[4].device_scale_factor);
+  EXPECT_EQ(2.0f, info.display_modes()[0]->device_scale_factor());
+  EXPECT_EQ(1.0f, info.display_modes()[1]->device_scale_factor());
+  EXPECT_EQ(1.25f, info.display_modes()[2]->device_scale_factor());
+  EXPECT_EQ(1.0f, info.display_modes()[3]->device_scale_factor());
+  EXPECT_EQ(1.0f, info.display_modes()[4]->device_scale_factor());
 
-  EXPECT_FALSE(info.display_modes()[0].native);
-  EXPECT_FALSE(info.display_modes()[1].native);
-  EXPECT_FALSE(info.display_modes()[2].native);
-  EXPECT_FALSE(info.display_modes()[3].native);
-  EXPECT_TRUE(info.display_modes()[4].native);
+  EXPECT_FALSE(info.display_modes()[0]->native());
+  EXPECT_FALSE(info.display_modes()[1]->native());
+  EXPECT_FALSE(info.display_modes()[2]->native());
+  EXPECT_FALSE(info.display_modes()[3]->native());
+  EXPECT_TRUE(info.display_modes()[4]->native());
 }
 
 TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIPNormal) {
   gfx::Size size(1366, 768);
   EXPECT_EQ("1536x864", GetModeSizeInDIP(size, 1.0f, 1.125f, true));
   EXPECT_EQ("1366x768", GetModeSizeInDIP(size, 1.0f, 1.0f, true));
   EXPECT_EQ("1092x614", GetModeSizeInDIP(size, 1.0f, 0.8f, true));
   EXPECT_EQ("853x480", GetModeSizeInDIP(size, 1.0f, 0.625f, true));
   EXPECT_EQ("683x384", GetModeSizeInDIP(size, 1.0f, 0.5f, true));
 }
@@ skipping 40 matching lines @@
   EXPECT_EQ(11, info.input_devices()[1]);
 
   DisplayInfo copy_info = DisplayInfo::CreateFromSpecWithID("200x100", 10);
   copy_info.Copy(info);
   EXPECT_EQ(2u, copy_info.input_devices().size());
   copy_info.ClearInputDevices();
   EXPECT_EQ(0u, copy_info.input_devices().size());
 }
 
 }  // namespace ash