Move cc::DisplayItemList and related classes into cc/paint/

cc/paint/discardable_image_map_unittest.cc

Index: cc/paint/discardable_image_map_unittest.cc
diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/paint/discardable_image_map_unittest.cc
similarity index 97%
rename from cc/playback/discardable_image_map_unittest.cc
rename to cc/paint/discardable_image_map_unittest.cc
index ff8441e495b4d99a918f6200c3099b27ac4e94f2..5d286255539d2ffcebd1b5173fa8ed5d14db5e6a 100644
--- a/cc/playback/discardable_image_map_unittest.cc
+++ b/cc/paint/discardable_image_map_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/playback/discardable_image_map.h"
+#include "cc/paint/discardable_image_map.h"
 
 #include <stddef.h>
 
@@ -107,8 +107,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
           image_map, gfx::Rect(x * 512, y * 512, 500, 500));
       if ((x + y) & 1) {
         EXPECT_EQ(1u, images.size()) << x << " " << y;
-        EXPECT_TRUE(images[0].image == discardable_image[y][x]) << x << " "
-                                                                << y;
+        EXPECT_TRUE(images[0].image == discardable_image[y][x])
+            << x << " " << y;
         EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
                   images[0].image_rect);
         EXPECT_EQ(images[0].image_rect,
@@ -194,8 +194,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
           image_map, gfx::Rect(1024 + x * 512, y * 512, 500, 500));
       if ((x + y) & 1) {
         EXPECT_EQ(1u, images.size()) << x << " " << y;
-        EXPECT_TRUE(images[0].image == discardable_image[y][x]) << x << " "
-                                                                << y;
+        EXPECT_TRUE(images[0].image == discardable_image[y][x])
+            << x << " " << y;
         EXPECT_EQ(gfx::Rect(1024 + x * 512 + 6, y * 512 + 6, 500, 500),
                   images[0].image_rect);
         EXPECT_EQ(images[0].image_rect,
@@ -310,8 +310,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {
           image_map, gfx::Rect(x * 512 + 256, y * 512 + 256, 1, 1));
       if ((x + y) & 1) {
         EXPECT_EQ(1u, images.size()) << x << " " << y;
-        EXPECT_TRUE(images[0].image == discardable_image[y][x]) << x << " "
-                                                                << y;
+        EXPECT_TRUE(images[0].image == discardable_image[y][x])
+            << x << " " << y;
         EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
                   images[0].image_rect);
         EXPECT_EQ(images[0].image_rect,
@@ -595,8 +595,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInShader) {
           image_map, gfx::Rect(x * 512, y * 512, 500, 500));
       if ((x + y) & 1) {
         EXPECT_EQ(1u, images.size()) << x << " " << y;
-        EXPECT_TRUE(images[0].image == discardable_image[y][x]) << x << " "
-                                                                << y;
+        EXPECT_TRUE(images[0].image == discardable_image[y][x])
+            << x << " " << y;
         EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
                   images[0].image_rect);
         EXPECT_EQ(std::max(x * 0.5f, kMinScale), images[0].scale.fWidth);