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 eee782e7a826a824d0616e596b9c28dcd5a9f4b9..fd7a63c3949eadbc404bb9633b0253fb75a2f14a 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>
 
@@ -120,8 +120,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
       std::vector<gfx::Rect> inset_rects = InsetImageRects(images);
       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),
                   inset_rects[0]);
         EXPECT_EQ(images[0].image_rect,
@@ -207,8 +207,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
       std::vector<gfx::Rect> inset_rects = InsetImageRects(images);
       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),
                   inset_rects[0]);
         EXPECT_EQ(images[0].image_rect,
@@ -323,8 +323,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {
       std::vector<gfx::Rect> inset_rects = InsetImageRects(images);
       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),
                   inset_rects[0]);
         EXPECT_EQ(images[0].image_rect,
@@ -616,8 +616,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInShader) {
       std::vector<gfx::Rect> inset_rects = InsetImageRects(images);
       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),
                   inset_rects[0]);
         EXPECT_EQ(std::max(x * 0.5f, kMinScale), images[0].scale.fWidth);