Make ash::DisplayMode more like ui::DisplayMode

ash/touch/touch_transformer_controller_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 "ash/touch/touch_transformer_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/devices/device_data_manager.h"
 
 namespace ash {
 
 namespace {
 
 DisplayInfo CreateDisplayInfo(int64_t id,
                               unsigned int touch_device_id,
                               const gfx::Rect& bounds) {
   DisplayInfo info(id, std::string(), false);
   info.SetBounds(bounds);
   info.AddInputDevice(touch_device_id);
 
   // Create a default mode.
-  std::vector<DisplayMode> default_modes(
-      1, DisplayMode(bounds.size(), 60, false, true));
+  DisplayInfo::DisplayModeList default_modes(
+      1, make_scoped_refptr(new DisplayMode(bounds.size(), 60, false, true)));
   info.SetDisplayModes(default_modes);
 
   return info;
 }
 
 ui::TouchscreenDevice CreateTouchscreenDevice(unsigned int id,
                                               const gfx::Size& size) {
   return ui::TouchscreenDevice(id, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
                                std::string(), size, 0);
 }
 
 }  //  namespace
 
 typedef test::AshTestBase TouchTransformerControllerTest;
 
 TEST_F(TouchTransformerControllerTest, MirrorModeLetterboxing) {
   // The internal display has native resolution of 2560x1700, and in
   // mirror mode it is configured as 1920x1200. This is in letterboxing
   // mode.
   DisplayInfo internal_display_info =
       CreateDisplayInfo(1, 10u, gfx::Rect(0, 0, 1920, 1200));
   internal_display_info.set_is_aspect_preserving_scaling(true);
-  std::vector<DisplayMode> internal_modes;
-  internal_modes.push_back(DisplayMode(gfx::Size(2560, 1700), 60, false, true));
-  internal_modes.push_back(
-      DisplayMode(gfx::Size(1920, 1200), 60, false, false));
+
+  DisplayInfo::DisplayModeList internal_modes;
+
+  internal_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(2560, 1700), 60, false, true)));
+  internal_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(1920, 1200), 60, false, false)));
   internal_display_info.SetDisplayModes(internal_modes);
 
   DisplayInfo external_display_info =
       CreateDisplayInfo(2, 11u, gfx::Rect(0, 0, 1920, 1200));
 
   gfx::Size fb_size(1920, 1200);
 
   // Create the touchscreens with the same size as the framebuffer so we can
   // share the tests between Ozone & X11.
   ui::TouchscreenDevice internal_touchscreen =
@@ skipping 46 matching lines @@
   EXPECT_NEAR(1200, y, 0.5);
 }
 
 TEST_F(TouchTransformerControllerTest, MirrorModePillarboxing) {
   // The internal display has native resolution of 1366x768, and in
   // mirror mode it is configured as 1024x768. This is in pillarboxing
   // mode.
   DisplayInfo internal_display_info =
       CreateDisplayInfo(1, 10, gfx::Rect(0, 0, 1024, 768));
   internal_display_info.set_is_aspect_preserving_scaling(true);
-  std::vector<DisplayMode> internal_modes;
-  internal_modes.push_back(DisplayMode(gfx::Size(1366, 768), 60, false, true));
-  internal_modes.push_back(DisplayMode(gfx::Size(1024, 768), 60, false, false));
+  DisplayInfo::DisplayModeList internal_modes;
+  internal_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(1366, 768), 60, false, true)));
+  internal_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(1024, 768), 60, false, false)));
   internal_display_info.SetDisplayModes(internal_modes);
 
   DisplayInfo external_display_info =
       CreateDisplayInfo(2, 11, gfx::Rect(0, 0, 1024, 768));
 
   gfx::Size fb_size(1024, 768);
 
   // Create the touchscreens with the same size as the framebuffer so we can
   // share the tests between Ozone & X11.
   ui::TouchscreenDevice internal_touchscreen =
@@ skipping 49 matching lines @@
 TEST_F(TouchTransformerControllerTest, SoftwareMirrorMode) {
   // External display 1 has size 1280x850. External display 2 has size
   // 1920x1080. When using software mirroring to mirror display 1 onto
   // display 2, the displays are in extended mode and we map touches from both
   // displays to display 1.
   // The total frame buffer is 1920x1990,
   // where 1990 = 850 + 60 (hidden gap) + 1080 and the second monitor is
   // translated to point (0, 950) in the framebuffer.
   DisplayInfo display1_info =
       CreateDisplayInfo(1, 10u, gfx::Rect(0, 0, 1280, 850));
-  std::vector<DisplayMode> display1_modes;
-  display1_modes.push_back(DisplayMode(gfx::Size(1280, 850), 60, false, true));
+  DisplayInfo::DisplayModeList display1_modes;
+  display1_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(1280, 850), 60, false, true)));
   display1_info.SetDisplayModes(display1_modes);
 
   DisplayInfo display2_info =
       CreateDisplayInfo(2, 11u, gfx::Rect(0, 950, 1920, 1080));
-  std::vector<DisplayMode> display2_modes;
-  display2_modes.push_back(DisplayMode(gfx::Size(1920, 1080), 60, false, true));
+  DisplayInfo::DisplayModeList display2_modes;
+  display2_modes.push_back(make_scoped_refptr(
+      new DisplayMode(gfx::Size(1920, 1080), 60, false, true)));
   display2_info.SetDisplayModes(display2_modes);
 
   gfx::Size fb_size(1920, 1990);
 
   // Create the touchscreens with the same size as the framebuffer so we can
   // share the tests between Ozone & X11.
   ui::TouchscreenDevice display1_touchscreen =
       CreateTouchscreenDevice(10, fb_size);
   ui::TouchscreenDevice display2_touchscreen =
       CreateTouchscreenDevice(11, fb_size);
@@ skipping 132 matching lines @@
       CreateTouchscreenDevice(5, gfx::Size(1001, 1001));
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   // Default touchscreen position range is 1001x1001;
   EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
             tt_controller->GetTouchResolutionScale(display, touch_device));
 }
 
 }  // namespace ash