Make ash::DisplayMode more like ui::DisplayMode

chrome/browser/extensions/display_info_provider_chromeos_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 "extensions/browser/api/system_display/display_info_provider.h"
 
 #include <stdint.h>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 1132 matching lines @@
   DisplayUnitInfoList result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
   ASSERT_GE(result.size(), 1u);
   const api::system_display::DisplayUnitInfo& primary_info = result[0];
   // Ensure that we have two modes for the primary display so that we can
   // test chaning modes.
   ASSERT_GE(primary_info.modes.size(), 2u);
 
   // Get the currently active mode and one other mode to switch to.
   int64_t id;
   base::StringToInt64(primary_info.id, &id);
-  ash::DisplayMode active_mode =
+  scoped_refptr<ash::DisplayMode> active_mode =
       GetDisplayManager()->GetActiveModeForDisplayId(id);
   const api::system_display::DisplayMode* cur_mode = nullptr;
   const api::system_display::DisplayMode* other_mode = nullptr;
   for (const auto& mode : primary_info.modes) {
     if (mode.is_selected)
       cur_mode = &mode;
     else if (!other_mode)
       other_mode = &mode;
     if (cur_mode && other_mode)
       break;
   }
   ASSERT_TRUE(cur_mode);
   ASSERT_TRUE(other_mode);
   ASSERT_NE(other_mode, cur_mode);
 
   // Verify that other_mode differs from the active mode.
-  ash::DisplayMode other_mode_ash;
-  other_mode_ash.size.SetSize(other_mode->width_in_native_pixels,
-                              other_mode->height_in_native_pixels);
-  other_mode_ash.ui_scale = other_mode->ui_scale;
-  other_mode_ash.device_scale_factor = other_mode->device_scale_factor;
-  EXPECT_FALSE(active_mode.IsEquivalent(other_mode_ash));
+  scoped_refptr<ash::DisplayMode> other_mode_ash(new ash::DisplayMode(
+      gfx::Size(other_mode->width_in_native_pixels,
+                other_mode->height_in_native_pixels),
+      active_mode->refresh_rate(), active_mode->is_interlaced(),
+      active_mode->native(), other_mode->ui_scale,
+      other_mode->device_scale_factor));
+  EXPECT_FALSE(active_mode->IsEquivalent(other_mode_ash));
 
   // Switch modes.
   api::system_display::DisplayProperties info;
   info.display_mode =
       api::system_display::DisplayMode::FromValue(*other_mode->ToValue());
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(id), info, &success, &error);
   ASSERT_TRUE(success);
 
   // Verify that other_mode now matches the active mode.
   active_mode = GetDisplayManager()->GetActiveModeForDisplayId(id);
-  EXPECT_TRUE(active_mode.IsEquivalent(other_mode_ash));
+  EXPECT_TRUE(active_mode->IsEquivalent(other_mode_ash));
 }
 
 }  // namespace
 }  // namespace extensions