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

chrome/browser/chromeos/display/display_preferences_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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.h"
@@ skipping 16 matching lines @@
 
 namespace chromeos {
 namespace {
 const char kPrimaryIdKey[] = "primary-id";
 const char kMirroredKey[] = "mirrored";
 const char kPositionKey[] = "position";
 const char kOffsetKey[] = "offset";
 
 class DisplayPreferencesTest : public ash::test::AshTestBase {
  protected:
-  DisplayPreferencesTest() : ash::test::AshTestBase(),
-                             mock_user_manager_(new MockUserManager),
-                             user_manager_enabler_(mock_user_manager_) {
+  DisplayPreferencesTest()
+      : mock_user_manager_(new MockUserManager),
+        user_manager_enabler_(mock_user_manager_) {
   }
 
   virtual ~DisplayPreferencesTest() {}
 
   virtual void SetUp() OVERRIDE {
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
         .WillRepeatedly(testing::Return(false));
     EXPECT_CALL(*mock_user_manager_, Shutdown());
     ash::test::AshTestBase::SetUp();
     RegisterDisplayLocalStatePrefs(local_state_.registry());
@@ skipping 294 matching lines @@
   EXPECT_TRUE(layout_value->GetString(kPositionKey, &position));
   EXPECT_EQ("right", position);
   EXPECT_TRUE(layout_value->GetInteger(kOffsetKey, &offset));
   EXPECT_EQ(0, offset);
   mirrored = true;
   EXPECT_TRUE(layout_value->GetBoolean(kMirroredKey, &mirrored));
   EXPECT_FALSE(mirrored);
   EXPECT_TRUE(layout_value->GetString(kPrimaryIdKey, &primary_id_str));
   EXPECT_EQ(base::Int64ToString(id1), primary_id_str);
 
+  // Best resolution should not be saved.
+  EXPECT_TRUE(properties->GetDictionary(base::Int64ToString(id2), &property));
+  EXPECT_FALSE(property->GetInteger("width", &width));
+  EXPECT_FALSE(property->GetInteger("height", &height));
+
+  // Set yet another new display's selected resolution.
+  display_manager->RegisterDisplayProperty(id2 + 1,
+                                           gfx::Display::ROTATE_0,
+                                           1.0f,
+                                           NULL,
+                                           gfx::Size(500, 400));
+  // Disconnect 2nd display first to generate new id for external display.
+  UpdateDisplay("200x200*2");
+  UpdateDisplay("200x200*2, 500x400#600x500|500x400");
+  // Update key as the 2nd display gets new id.
+  id2 = ash::ScreenAsh::GetSecondaryDisplay().id();
+  key = base::Int64ToString(id1) + "," + base::Int64ToString(id2);
+  EXPECT_TRUE(displays->GetDictionary(key, &layout_value));
+  EXPECT_TRUE(layout_value->GetString(kPositionKey, &position));
+  EXPECT_EQ("right", position);
+  EXPECT_TRUE(layout_value->GetInteger(kOffsetKey, &offset));
+  EXPECT_EQ(0, offset);
+  mirrored = true;
+  EXPECT_TRUE(layout_value->GetBoolean(kMirroredKey, &mirrored));
+  EXPECT_FALSE(mirrored);
+  EXPECT_TRUE(layout_value->GetString(kPrimaryIdKey, &primary_id_str));
+  EXPECT_EQ(base::Int64ToString(id1), primary_id_str);
+
   // External dispaly's selected resolution must be updated.
   EXPECT_TRUE(properties->GetDictionary(base::Int64ToString(id2), &property));
   EXPECT_TRUE(property->GetInteger("width", &width));
   EXPECT_TRUE(property->GetInteger("height", &height));
   EXPECT_EQ(500, width);
   EXPECT_EQ(400, height);
 }
 
 TEST_F(DisplayPreferencesTest, PreventStore) {
   ResolutionNotificationController::SuppressTimerForTest();
@@ skipping 170 matching lines @@
             local_state()->GetString(prefs::kDisplayPowerState));
 
   // Don't try to load
   local_state()->SetString(prefs::kDisplayPowerState, "all_off");
   LoadDisplayPreferences(false);
   EXPECT_EQ(chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON,
             shell->output_configurator()->power_state());
 }
 
 }  // namespace chromeos