Make ash::DisplayMode more like ui::DisplayMode

ash/test/display_manager_test_api.cc

 // Copyright (c) 2012 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/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 137 matching lines @@
   DisplayManagerTestApi().SetInternalDisplayId(id);
 }
 
 ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
   display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
 }
 
 bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& info = display_manager->GetDisplayInfo(display_id);
-  DisplayMode mode;
-  if (!GetDisplayModeForResolution(info, resolution, &mode))
+  scoped_refptr<DisplayMode> mode =
+      GetDisplayModeForResolution(info, resolution);
+  if (!mode)
     return false;
   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 void SwapPrimaryDisplay() {
   if (display::Screen::GetScreen()->GetNumDisplays() <= 1)
     return;
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       ScreenUtil::GetSecondaryDisplay().id());
 }
@@ skipping 26 matching lines @@
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
   SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace ash