Update the selected resolution to the resolution that is actually selected.

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_ash.h"
 #include "ash/shell.h"
@@ skipping 731 matching lines @@
   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_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<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<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 = 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);
+
+    gfx::Size selected;
+    EXPECT_TRUE(display_manager()->GetSelectedResolutionForDisplayId(
+        display_id, &selected));
+    EXPECT_EQ("400x500", selected.ToString());
+  }
+  {
+    // 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<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);
+
+    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());
   EXPECT_EQ("200x100",
             GetDisplayInfoAt(0).size_in_pixel().ToString());
 
@@ skipping 367 matching lines @@
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", dispatcher0->host()->GetBounds().origin().ToString());
   EXPECT_EQ("100x200", dispatcher0->host()->GetBounds().size().ToString());
   EXPECT_EQ("300,500", dispatcher1->host()->GetBounds().origin().ToString());
   EXPECT_EQ("200x300", dispatcher1->host()->GetBounds().size().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash