Relocate reuseable portions of ash/display/display_util.*

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 2e70a1b4ce9b0116aa4a9fa239f195b4705782ff..ca58a9c333ea8bafc8b70e5d9a22960be4fedebd 100644
--- a/ash/display/display_util_unittest.cc
+++ b/ash/display/display_util_unittest.cc
@@ -91,88 +91,4 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
   }
 }
 
-TEST_F(DisplayUtilTest, GenerateDisplayIdList) {
-  display::DisplayIdList list;
-  {
-    int64_t ids[] = {10, 1};
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(1, list[0]);
-    EXPECT_EQ(10, list[1]);
-
-    int64_t three_ids[] = {10, 5, 1};
-    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
-    ASSERT_EQ(3u, list.size());
-    EXPECT_EQ(1, list[0]);
-    EXPECT_EQ(5, list[1]);
-    EXPECT_EQ(10, list[2]);
-  }
-  {
-    int64_t ids[] = {10, 100};
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(10, list[0]);
-    EXPECT_EQ(100, list[1]);
-
-    int64_t three_ids[] = {10, 100, 1000};
-    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
-    ASSERT_EQ(3u, list.size());
-    EXPECT_EQ(10, list[0]);
-    EXPECT_EQ(100, list[1]);
-    EXPECT_EQ(1000, list[2]);
-  }
-  {
-    test::ScopedSetInternalDisplayId set_internal(100);
-    int64_t ids[] = {10, 100};
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(100, list[0]);
-    EXPECT_EQ(10, list[1]);
-
-    std::swap(ids[0], ids[1]);
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(100, list[0]);
-    EXPECT_EQ(10, list[1]);
-
-    int64_t three_ids[] = {10, 100, 1000};
-    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
-    ASSERT_EQ(3u, list.size());
-    EXPECT_EQ(100, list[0]);
-    EXPECT_EQ(10, list[1]);
-    EXPECT_EQ(1000, list[2]);
-  }
-  {
-    test::ScopedSetInternalDisplayId set_internal(10);
-    int64_t ids[] = {10, 100};
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(10, list[0]);
-    EXPECT_EQ(100, list[1]);
-
-    std::swap(ids[0], ids[1]);
-    list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ(10, list[0]);
-    EXPECT_EQ(100, list[1]);
-
-    int64_t three_ids[] = {10, 100, 1000};
-    list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
-    ASSERT_EQ(3u, list.size());
-    EXPECT_EQ(10, list[0]);
-    EXPECT_EQ(100, list[1]);
-    EXPECT_EQ(1000, list[2]);
-  }
-}
-
-TEST_F(DisplayUtilTest, DisplayIdListToString) {
-  {
-    int64_t ids[] = {10, 1, 16};
-    display::DisplayIdList list =
-        GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ("1,10,16", DisplayIdListToString(list));
-  }
-  {
-    test::ScopedSetInternalDisplayId set_internal(16);
-    int64_t ids[] = {10, 1, 16};
-    display::DisplayIdList list =
-        GenerateDisplayIdList(std::begin(ids), std::end(ids));
-    EXPECT_EQ("16,1,10", DisplayIdListToString(list));
-  }
-}
-
-}  // namespace
+}  // namespace ash