Revert of Read compositor VSync information from platform, when possible

ash/display/display_manager_unittest.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/display/display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 701 matching lines @@
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ("-500,0 500x500",
             GetDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("0,0 100x100", GetDisplayForId(10).bounds().ToString());
 }
 
 TEST_F(DisplayManagerTest, DontRememberBestResolution) {
   int display_id = 1000;
   DisplayInfo native_display_info =
       CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
-  std::vector<DisplayMode> display_modes;
-  display_modes.push_back(
-      DisplayMode(gfx::Size(1000, 500), 58.0f, false, true));
-  display_modes.push_back(
-      DisplayMode(gfx::Size(800, 300), 59.0f, false, false));
-  display_modes.push_back(
-      DisplayMode(gfx::Size(400, 500), 60.0f, false, false));
+  std::vector<Resolution> resolutions;
+  resolutions.push_back(Resolution(gfx::Size(1000, 500), false));
+  resolutions.push_back(Resolution(gfx::Size(800, 300), false));
+  resolutions.push_back(Resolution(gfx::Size(400, 500), false));
 
-  native_display_info.set_display_modes(display_modes);
+  native_display_info.set_resolutions(resolutions);
 
   std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(native_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
 
-  DisplayMode mode;
-  EXPECT_FALSE(
-      display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
+  gfx::Size selected;
+  EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
+      display_id, &selected));
 
   // Unsupported resolution.
   display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 4000));
-  EXPECT_FALSE(
-      display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
+  EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
+      display_id, &selected));
 
   // Supported resolution.
   display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 300));
-  EXPECT_TRUE(
-      display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
-  EXPECT_EQ("800x300", mode.size.ToString());
-  EXPECT_EQ(59.0f, mode.refresh_rate);
-  EXPECT_FALSE(mode.native);
+  EXPECT_TRUE(display_manager()->GetSelectedResolutionForDisplayId(
+      display_id, &selected));
+  EXPECT_EQ("800x300", selected.ToString());
 
   // Best resolution.
   display_manager()->SetDisplayResolution(display_id, gfx::Size(1000, 500));
-  EXPECT_TRUE(
-      display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
-  EXPECT_EQ("1000x500", mode.size.ToString());
-  EXPECT_EQ(58.0f, mode.refresh_rate);
-  EXPECT_TRUE(mode.native);
+  EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
+      display_id, &selected));
 }
 
 TEST_F(DisplayManagerTest, ResolutionFallback) {
   int display_id = 1000;
   DisplayInfo native_display_info =
       CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
-  std::vector<DisplayMode> display_modes;
-  display_modes.push_back(
-      DisplayMode(gfx::Size(1000, 500), 58.0f, false, true));
-  display_modes.push_back(
-      DisplayMode(gfx::Size(800, 300), 59.0f, false, false));
-  display_modes.push_back(
-      DisplayMode(gfx::Size(400, 500), 60.0f, false, false));
+  std::vector<Resolution> resolutions;
+  resolutions.push_back(Resolution(gfx::Size(1000, 500), false));
+  resolutions.push_back(Resolution(gfx::Size(800, 300), false));
+  resolutions.push_back(Resolution(gfx::Size(400, 500), false));
 
-  std::vector<DisplayMode> copy = display_modes;
-  native_display_info.set_display_modes(copy);
+  std::vector<Resolution> copy = resolutions;
+  native_display_info.set_resolutions(copy);
 
   std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(native_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   {
     display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 300));
     DisplayInfo new_native_display_info =
         CreateDisplayInfo(display_id, gfx::Rect(0, 0, 400, 500));
-    copy = display_modes;
-    new_native_display_info.set_display_modes(copy);
+    copy = resolutions;
+    new_native_display_info.set_resolutions(copy);
     std::vector<DisplayInfo> new_display_info_list;
     new_display_info_list.push_back(new_native_display_info);
     display_manager()->OnNativeDisplaysChanged(new_display_info_list);
 
-    DisplayMode mode;
-    EXPECT_TRUE(
-        display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
-    EXPECT_EQ("400x500", mode.size.ToString());
-    EXPECT_EQ(60.0f, mode.refresh_rate);
-    EXPECT_FALSE(mode.native);
+    gfx::Size selected;
+    EXPECT_TRUE(display_manager()->GetSelectedResolutionForDisplayId(
+        display_id, &selected));
+    EXPECT_EQ("400x500", selected.ToString());
   }
   {
-    // Best resolution should find itself on the resolutions list.
+    // Best resolution should not be set.
     display_manager()->SetDisplayResolution(display_id, gfx::Size(800, 300));
     DisplayInfo new_native_display_info =
         CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1000, 500));
-    std::vector<DisplayMode> copy = display_modes;
-    new_native_display_info.set_display_modes(copy);
+    std::vector<Resolution> copy = resolutions;
+    new_native_display_info.set_resolutions(copy);
     std::vector<DisplayInfo> new_display_info_list;
     new_display_info_list.push_back(new_native_display_info);
     display_manager()->OnNativeDisplaysChanged(new_display_info_list);
 
-    DisplayMode mode;
-    EXPECT_TRUE(
-        display_manager()->GetSelectedModeForDisplayId(display_id, &mode));
-    EXPECT_EQ("1000x500", mode.size.ToString());
-    EXPECT_EQ(58.0f, mode.refresh_rate);
-    EXPECT_TRUE(mode.native);
+    gfx::Size selected;
+    EXPECT_FALSE(display_manager()->GetSelectedResolutionForDisplayId(
+        display_id, &selected));
   }
 }
 
 TEST_F(DisplayManagerTest, Rotate) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("100x200/r,300x400/l");
   EXPECT_EQ("1,1 100x200",
             GetDisplayInfoAt(0).bounds_in_native().ToString());
@@ skipping 403 matching lines @@
 };
 
 TEST_F(ScreenShutdownTest, ScreenAfterShutdown) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("500x300,800x400");
 }
 
 }  // namespace internal
 }  // namespace ash