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

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/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
@@ skipping 1584 matching lines @@
   display_info_list.push_back(d2);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   ASSERT_TRUE(display_manager()->IsInMirrorMode());
   display_manager()->SetUnifiedDesktopEnabled(true);
   EXPECT_TRUE(display_manager()->IsInMirrorMode());
 
   // The display manager automaticaclly switches to software mirroring
   // if the displays are configured to use mirroring when running on desktop.
   // This is a workdaround to force the display manager to forget
   // the mirroing layout.
-  DisplayIdPair pair = CreateDisplayIdPair(1, 2);
+  DisplayIdList list = CreateDisplayIdList(1, 2);
   DisplayLayout layout =
-      display_manager()->layout_store()->GetRegisteredDisplayLayout(pair);
+      display_manager()->layout_store()->GetRegisteredDisplayLayout(list);
   layout.mirrored = false;
-  display_manager()->layout_store()->RegisterLayoutForDisplayIdPair(1, 2,
+  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(1, 2,
                                                                     layout);
 
   // Exit from hardware mirroring.
   d2.SetBounds(gfx::Rect(0, 500, 500, 500));
   display_info_list.clear();
   display_info_list.push_back(d1);
   display_info_list.push_back(d2);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_FALSE(display_manager()->IsInMirrorMode());
   EXPECT_TRUE(display_manager()->IsInUnifiedMode());
 }
 
 TEST_F(DisplayManagerTest, UnifiedDesktopEnabledWithExtended) {
   if (!SupportsMultipleDisplays())
     return;
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   UpdateDisplay("400x500,300x200");
-  DisplayIdPair pair = display_manager()->GetCurrentDisplayIdPair();
+  DisplayIdList list = display_manager()->GetCurrentDisplayIdList();
   DisplayLayout layout =
-      display_manager()->layout_store()->GetRegisteredDisplayLayout(pair);
+      display_manager()->layout_store()->GetRegisteredDisplayLayout(list);
   layout.default_unified = false;
-  display_manager()->layout_store()->RegisterLayoutForDisplayIdPair(
-      pair.first, pair.second, layout);
+  display_manager()->layout_store()->RegisterLayoutForDisplayIdList(
+      list[0], list[1], layout);
   display_manager()->SetUnifiedDesktopEnabled(true);
   EXPECT_FALSE(display_manager()->IsInUnifiedMode());
 }
 
 TEST_F(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
   if (!SupportsMultipleDisplays())
     return;
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
@@ skipping 374 matching lines @@
 }
 
 TEST_F(DisplayManagerTest, RejectInvalidLayoutData) {
   DisplayLayoutStore* layout_store = display_manager()->layout_store();
   int64_t id1 = 10001;
   int64_t id2 = 10002;
   ASSERT_TRUE(CompareDisplayIds(id1, id2));
   DisplayLayout good(DisplayLayout(DisplayLayout::LEFT, 0));
   good.primary_id = id1;
 
-  layout_store->RegisterLayoutForDisplayIdPair(id1, id2, good);
+  layout_store->RegisterLayoutForDisplayIdList(id1, id2, good);
 
   DisplayLayout bad(DisplayLayout(DisplayLayout::BOTTOM, 0));
   good.primary_id = id2;
 
-  layout_store->RegisterLayoutForDisplayIdPair(id2, id1, bad);
+  layout_store->RegisterLayoutForDisplayIdList(id2, id1, bad);
 
-  EXPECT_EQ(good.ToString(), layout_store->GetRegisteredDisplayLayout(
-                                             CreateDisplayIdPair(id1, id2))
-                                 .ToString());
+  EXPECT_EQ(
+      good.ToString(),
+      layout_store->GetRegisteredDisplayLayout(CreateDisplayIdList(id1, id2))
+          .ToString());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash