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

ash/display/display_util_unittest.cc

Index: ash/display/display_util_unittest.cc
diff --git a/ash/display/display_util_unittest.cc b/ash/display/display_util_unittest.cc
index 1dcd0c7c87fd52cd80d9483d509949f20395ddd8..dabb91ecd8954958258447ce82650881ec0063e1 100644
--- a/ash/display/display_util_unittest.cc
+++ b/ash/display/display_util_unittest.cc
@@ -92,32 +92,32 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
 }
 
 TEST_F(DisplayUtilTest, CreateDisplayIdPair) {
-  DisplayIdPair pair = CreateDisplayIdPair(10, 1);
-  EXPECT_EQ(1, pair.first);
-  EXPECT_EQ(10, pair.second);
-  pair = CreateDisplayIdPair(10, 100);
-  EXPECT_EQ(10, pair.first);
-  EXPECT_EQ(100, pair.second);
+  DisplayIdList list = CreateDisplayIdList(10, 1);
+  EXPECT_EQ(1, list[0]);
+  EXPECT_EQ(10, list[1]);
+  list = CreateDisplayIdList(10, 100);
+  EXPECT_EQ(10, list[0]);
+  EXPECT_EQ(100, list[1]);
   {
     test::ScopedSetInternalDisplayId set_internal(100);
-    pair = CreateDisplayIdPair(10, 100);
-    EXPECT_EQ(100, pair.first);
-    EXPECT_EQ(10, pair.second);
+    list = CreateDisplayIdList(10, 100);
+    EXPECT_EQ(100, list[0]);
+    EXPECT_EQ(10, list[1]);
 
-    pair = CreateDisplayIdPair(100, 10);
-    EXPECT_EQ(100, pair.first);
-    EXPECT_EQ(10, pair.second);
+    list = CreateDisplayIdList(100, 10);
+    EXPECT_EQ(100, list[0]);
+    EXPECT_EQ(10, list[1]);
   }
 
   {
     test::ScopedSetInternalDisplayId set_internal(10);
-    pair = CreateDisplayIdPair(10, 100);
-    EXPECT_EQ(10, pair.first);
-    EXPECT_EQ(100, pair.second);
+    list = CreateDisplayIdList(10, 100);
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
 
-    pair = CreateDisplayIdPair(100, 10);
-    EXPECT_EQ(10, pair.first);
-    EXPECT_EQ(100, pair.second);
+    list = CreateDisplayIdList(100, 10);
+    EXPECT_EQ(10, list[0]);
+    EXPECT_EQ(100, list[1]);
   }
 }