Use list instead of pair to represent the set of displays.

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 <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 36 matching lines @@
 
 // The mean acceleration due to gravity on Earth in m/s^2.
 const float kMeanGravity = -9.80665f;
 
 bool IsRotationLocked() {
   return ash::Shell::GetInstance()
       ->screen_orientation_controller()
       ->rotation_locked();
 }
 
-std::string ToPairString(const ash::DisplayIdPair& pair) {
-  return base::Int64ToString(pair.first) + "," +
-         base::Int64ToString(pair.second);
-}
-
 class DisplayPreferencesTest : public ash::test::AshTestBase {
  protected:
   DisplayPreferencesTest()
       : mock_user_manager_(new MockUserManager),
         user_manager_enabler_(mock_user_manager_) {
   }
 
   ~DisplayPreferencesTest() override {}
 
   void SetUp() override {
@@ skipping 23 matching lines @@
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
         .WillRepeatedly(testing::Return(true));
     EXPECT_CALL(*mock_user_manager_, IsLoggedInAsUserWithGaiaAccount())
         .WillRepeatedly(testing::Return(false));
     EXPECT_CALL(*mock_user_manager_, IsLoggedInAsSupervisedUser())
         .WillRepeatedly(testing::Return(false));
   }
 
   // Do not use the implementation of display_preferences.cc directly to avoid
   // notifying the update to the system.
-  void StoreDisplayLayoutPrefForPair(const ash::DisplayIdPair& pair,
+  void StoreDisplayLayoutPrefForList(const ash::DisplayIdList& list,
                                      ash::DisplayLayout::Position layout,
                                      int offset,
                                      int64_t primary_id) {
-    std::string name = ToPairString(pair);
+    std::string name = ash::DisplayIdListToString(list);
     DictionaryPrefUpdate update(&local_state_, prefs::kSecondaryDisplays);
     ash::DisplayLayout display_layout(layout, offset);
     display_layout.primary_id = primary_id;
 
     DCHECK(!name.empty());
 
     base::DictionaryValue* pref_data = update.Get();
     scoped_ptr<base::Value>layout_value(new base::DictionaryValue());
     if (pref_data->HasKey(name)) {
       base::Value* value = NULL;
       if (pref_data->Get(name, &value) && value != NULL)
         layout_value.reset(value->DeepCopy());
     }
     if (ash::DisplayLayout::ConvertToValue(display_layout, layout_value.get()))
       pref_data->Set(name, layout_value.release());
   }
 
-  void StoreDisplayPropertyForPair(const ash::DisplayIdPair& pair,
+  void StoreDisplayPropertyForList(const ash::DisplayIdList& list,
                                    std::string key,
                                    scoped_ptr<base::Value> value) {
-    std::string name = ToPairString(pair);
+    std::string name = ash::DisplayIdListToString(list);
 
     DictionaryPrefUpdate update(&local_state_, prefs::kSecondaryDisplays);
     base::DictionaryValue* pref_data = update.Get();
 
     if (pref_data->HasKey(name)) {
       base::Value* layout_value = NULL;
       pref_data->Get(name, &layout_value);
       if (layout_value)
         static_cast<base::DictionaryValue*>(layout_value)
             ->Set(key, std::move(value));
     } else {
       scoped_ptr<base::DictionaryValue> layout_value(
           new base::DictionaryValue());
       layout_value->SetBoolean(key, value);
       pref_data->Set(name, layout_value.release());
     }
   }
 
-  void StoreDisplayBoolPropertyForPair(const ash::DisplayIdPair& pair,
+  void StoreDisplayBoolPropertyForList(const ash::DisplayIdList& list,
                                        const std::string& key,
                                        bool value) {
-    StoreDisplayPropertyForPair(
-        pair, key, make_scoped_ptr(new base::FundamentalValue(value)));
+    StoreDisplayPropertyForList(
+        list, key, make_scoped_ptr(new base::FundamentalValue(value)));
   }
 
-  void StoreDisplayLayoutPrefForPair(const ash::DisplayIdPair& pair,
+  void StoreDisplayLayoutPrefForList(const ash::DisplayIdList& list,
                                      ash::DisplayLayout::Position layout,
                                      int offset) {
-    StoreDisplayLayoutPrefForPair(pair, layout, offset, pair.first);
+    StoreDisplayLayoutPrefForList(list, layout, offset, list[0]);
   }
 
   void StoreDisplayOverscan(int64_t id, const gfx::Insets& insets) {
     DictionaryPrefUpdate update(&local_state_, prefs::kDisplayProperties);
     const std::string name = base::Int64ToString(id);
 
     base::DictionaryValue* pref_data = update.Get();
     base::DictionaryValue* insets_value = new base::DictionaryValue();
     insets_value->SetInteger("insets_top", insets.top());
     insets_value->SetInteger("insets_left", insets.left());
@@ skipping 13 matching lines @@
   }
 
   void StoreDisplayRotationPrefsForTest(bool rotation_lock,
                                         gfx::Display::Rotation rotation) {
     DictionaryPrefUpdate update(local_state(), prefs::kDisplayRotationLock);
     base::DictionaryValue* pref_data = update.Get();
     pref_data->SetBoolean("lock", rotation_lock);
     pref_data->SetInteger("orientation", static_cast<int>(rotation));
   }
 
-  std::string GetRegisteredDisplayLayoutStr(const ash::DisplayIdPair& pair) {
-    return ash::Shell::GetInstance()->display_manager()->layout_store()->
-        GetRegisteredDisplayLayout(pair).ToString();
+  std::string GetRegisteredDisplayLayoutStr(const ash::DisplayIdList& list) {
+    return ash::Shell::GetInstance()
+        ->display_manager()
+        ->layout_store()
+        ->GetRegisteredDisplayLayout(list)
+        .ToString();
   }
 
   PrefService* local_state() { return &local_state_; }
 
  private:
   MockUserManager* mock_user_manager_;  // Not owned.
   ScopedUserManagerEnabler user_manager_enabler_;
   TestingPrefServiceSimple local_state_;
   scoped_ptr<DisplayConfigurationObserver> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayPreferencesTest);
 };
 
 }  // namespace
 
-TEST_F(DisplayPreferencesTest, PairedLayoutOverrides) {
+TEST_F(DisplayPreferencesTest, ListedLayoutOverrides) {
   UpdateDisplay("100x100,200x200");
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
 
-  ash::DisplayIdPair pair = display_manager->GetCurrentDisplayIdPair();
-  ash::DisplayIdPair dummy_pair = std::make_pair(pair.first, pair.second + 1);
-  ASSERT_NE(pair.first, dummy_pair.second);
+  ash::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
+  ash::DisplayIdList dummy_list =
+      ash::CreateDisplayIdList(list[0], list[1] + 1);
+  ASSERT_NE(list[0], dummy_list[1]);
 
-  StoreDisplayLayoutPrefForPair(pair, ash::DisplayLayout::TOP, 20);
-  StoreDisplayLayoutPrefForPair(dummy_pair, ash::DisplayLayout::LEFT, 30);
+  StoreDisplayLayoutPrefForList(list, ash::DisplayLayout::TOP, 20);
+  StoreDisplayLayoutPrefForList(dummy_list, ash::DisplayLayout::LEFT, 30);
   StoreDisplayPowerStateForTest(
       chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON);
 
   ash::Shell* shell = ash::Shell::GetInstance();
 
   LoadDisplayPreferences(true);
   // DisplayPowerState should be ignored at boot.
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON,
             shell->display_configurator()->requested_power_state());
 
   shell->display_manager()->UpdateDisplays();
   // Check if the layout settings are notified to the system properly.
-  // The paired layout overrides old layout.
-  // Inverted one of for specified pair (id1, id2).  Not used for the pair
+  // The new layout overrides old layout.
+  // Inverted one of for specified pair (id1, id2).  Not used for the list
   // (id1, dummy_id) since dummy_id is not connected right now.
   EXPECT_EQ("top, 20",
             shell->display_manager()->GetCurrentDisplayLayout().ToString());
-  EXPECT_EQ("top, 20", GetRegisteredDisplayLayoutStr(pair));
-  EXPECT_EQ("left, 30", GetRegisteredDisplayLayoutStr(dummy_pair));
+  EXPECT_EQ("top, 20", GetRegisteredDisplayLayoutStr(list));
+  EXPECT_EQ("left, 30", GetRegisteredDisplayLayoutStr(dummy_list));
 }
 
 TEST_F(DisplayPreferencesTest, BasicStores) {
   ash::WindowTreeHostManager* window_tree_host_manager =
       ash::Shell::GetInstance()->window_tree_host_manager();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
 
   UpdateDisplay("200x200*2, 400x300#400x400|300x200*1.25");
   int64_t id1 = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ skipping 629 matching lines @@
 }
 
 TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
 
   LoggedInAsUser();
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
 
   UpdateDisplay("200x200,100x100");
-  ash::DisplayIdPair pair = display_manager->GetCurrentDisplayIdPair();
+  ash::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
   EXPECT_EQ("400x200",
             gfx::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
 
   const base::DictionaryValue* secondary_displays =
       local_state()->GetDictionary(prefs::kSecondaryDisplays);
   const base::DictionaryValue* new_value = NULL;
-  EXPECT_TRUE(
-      secondary_displays->GetDictionary(ToPairString(pair), &new_value));
+  EXPECT_TRUE(secondary_displays->GetDictionary(
+      ash::DisplayIdListToString(list), &new_value));
 
   ash::DisplayLayout stored_layout;
   EXPECT_TRUE(ash::DisplayLayout::ConvertFromValue(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 
   const base::DictionaryValue* displays =
       local_state()->GetDictionary(prefs::kDisplayProperties);
   int64_t unified_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
   EXPECT_FALSE(
       displays->GetDictionary(base::Int64ToString(unified_id), &new_value));
 
   ash::test::SetDisplayResolution(unified_id, gfx::Size(200, 100));
   EXPECT_EQ("200x100",
             gfx::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
   EXPECT_FALSE(
       displays->GetDictionary(base::Int64ToString(unified_id), &new_value));
 
   // Mirror mode should remember if the default mode was unified.
   display_manager->SetMirrorMode(true);
-  ASSERT_TRUE(
-      secondary_displays->GetDictionary(ToPairString(pair), &new_value));
+  ASSERT_TRUE(secondary_displays->GetDictionary(
+      ash::DisplayIdListToString(list), &new_value));
   EXPECT_TRUE(ash::DisplayLayout::ConvertFromValue(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_TRUE(stored_layout.mirrored);
 
   display_manager->SetMirrorMode(false);
-  ASSERT_TRUE(
-      secondary_displays->GetDictionary(ToPairString(pair), &new_value));
+  ASSERT_TRUE(secondary_displays->GetDictionary(
+      ash::DisplayIdListToString(list), &new_value));
   EXPECT_TRUE(ash::DisplayLayout::ConvertFromValue(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 
   // Exit unified mode.
   display_manager->SetDefaultMultiDisplayModeForCurrentDisplays(
       ash::DisplayManager::EXTENDED);
-  ASSERT_TRUE(
-      secondary_displays->GetDictionary(ToPairString(pair), &new_value));
+  ASSERT_TRUE(secondary_displays->GetDictionary(
+      ash::DisplayIdListToString(list), &new_value));
   EXPECT_TRUE(ash::DisplayLayout::ConvertFromValue(*new_value, &stored_layout));
   EXPECT_FALSE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 }
 
 TEST_F(DisplayPreferencesTest, RestoreUnifiedMode) {
   int64_t id1 = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();
-  ash::DisplayIdPair pair = std::make_pair(id1, id1 + 1);
-  StoreDisplayBoolPropertyForPair(pair, "default_unified", true);
-  StoreDisplayPropertyForPair(
-      pair, "primary-id",
+  ash::DisplayIdList list = ash::CreateDisplayIdList(id1, id1 + 1);
+  StoreDisplayBoolPropertyForList(list, "default_unified", true);
+  StoreDisplayPropertyForList(
+      list, "primary-id",
       make_scoped_ptr(new base::StringValue(base::Int64ToString(id1))));
   LoadDisplayPreferences(false);
 
   // Should not restore to unified unless unified desktop is enabled.
   UpdateDisplay("100x100,200x200");
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   EXPECT_FALSE(display_manager->IsInUnifiedMode());
 
   // Restored to unified.
   display_manager->SetUnifiedDesktopEnabled(true);
-  StoreDisplayBoolPropertyForPair(pair, "default_unified", true);
+  StoreDisplayBoolPropertyForList(list, "default_unified", true);
   LoadDisplayPreferences(false);
   UpdateDisplay("100x100,200x200");
   EXPECT_TRUE(display_manager->IsInUnifiedMode());
 
   // Restored to mirror, then unified.
-  StoreDisplayBoolPropertyForPair(pair, "mirrored", true);
-  StoreDisplayBoolPropertyForPair(pair, "default_unified", true);
+  StoreDisplayBoolPropertyForList(list, "mirrored", true);
+  StoreDisplayBoolPropertyForList(list, "default_unified", true);
   LoadDisplayPreferences(false);
   UpdateDisplay("100x100,200x200");
   EXPECT_TRUE(display_manager->IsInMirrorMode());
 
   display_manager->SetMirrorMode(false);
   EXPECT_TRUE(display_manager->IsInUnifiedMode());
 
   // Sanity check. Restore to extended.
-  StoreDisplayBoolPropertyForPair(pair, "default_unified", false);
-  StoreDisplayBoolPropertyForPair(pair, "mirrored", false);
+  StoreDisplayBoolPropertyForList(list, "default_unified", false);
+  StoreDisplayBoolPropertyForList(list, "mirrored", false);
   LoadDisplayPreferences(false);
   UpdateDisplay("100x100,200x200");
   EXPECT_FALSE(display_manager->IsInMirrorMode());
   EXPECT_FALSE(display_manager->IsInUnifiedMode());
 }
 
 }  // namespace chromeos