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

cc/base/filter_operations_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
-#include "cc/output/filter_operations.h"
+#include "cc/base/filter_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
 #include "third_party/skia/include/effects/SkOffsetImageFilter.h"
 #include "third_party/skia/include/effects/SkXfermodeImageFilter.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 namespace {
@@ skipping 371 matching lines @@
   SAVE_RESTORE_AMOUNT(Grayscale, GRAYSCALE, 0.6f);
   SAVE_RESTORE_AMOUNT(Sepia, SEPIA, 0.6f);
   SAVE_RESTORE_AMOUNT(Saturate, SATURATE, 0.6f);
   SAVE_RESTORE_AMOUNT(HueRotate, HUE_ROTATE, 0.6f);
   SAVE_RESTORE_AMOUNT(Invert, INVERT, 0.6f);
   SAVE_RESTORE_AMOUNT(Brightness, BRIGHTNESS, 0.6f);
   SAVE_RESTORE_AMOUNT(Contrast, CONTRAST, 0.6f);
   SAVE_RESTORE_AMOUNT(Opacity, OPACITY, 0.6f);
   SAVE_RESTORE_AMOUNT(Blur, BLUR, 0.6f);
   SAVE_RESTORE_AMOUNT(SaturatingBrightness, SATURATING_BRIGHTNESS, 0.6f);
-  SAVE_RESTORE_OFFSET_AMOUNT_COLOR(
-      DropShadow, DROP_SHADOW, gfx::Point(3, 4), 0.4f, 0xffffff00);
+  SAVE_RESTORE_OFFSET_AMOUNT_COLOR(DropShadow, DROP_SHADOW, gfx::Point(3, 4),
+                                   0.4f, 0xffffff00);
 
-  SkScalar matrix[20] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-                         17, 18, 19, 20};
+  SkScalar matrix[20] = {1,  2,  3,  4,  5,  6,  7,  8,  9,  10,
+                         11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
   SAVE_RESTORE_MATRIX(ColorMatrix, COLOR_MATRIX, matrix);
 
   SAVE_RESTORE_AMOUNT_INSET(Zoom, ZOOM, 0.5f, 32);
 }
 
 TEST(FilterOperationsTest, BlendGrayscaleFilters) {
   FilterOperation from = FilterOperation::CreateGrayscaleFilter(0.25f);
   FilterOperation to = FilterOperation::CreateGrayscaleFilter(0.75f);
 
   FilterOperation blended = FilterOperation::Blend(&from, &to, -0.75);
@@ skipping 556 matching lines @@
 
   filters.Append(FilterOperation::CreateSaturateFilter(3.f));
   filters.Append(FilterOperation::CreateBlurFilter(2.f));
   EXPECT_EQ(std::string("{\"FilterOperations\":[{\"amount\":3.0,\"type\":2},"
                         "{\"amount\":2.0,\"type\":8}]}"),
             filters.ToString());
 }
 
 }  // namespace
 }  // namespace cc