IWYU for some more test files starting with 'C'.

Change-Id: I010527b342cbfa0b425ef0d00966219413d9e77d
Reviewed-on: https://skia-review.googlesource.com/121886
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

9 files changed, 64 insertions, 23 deletions

diff --git a/tests/CPlusPlusEleven.cpp b/tests/CPlusPlusEleven.cpp
index bbd8a12f88..fb3e765f1c 100644
--- a/tests/CPlusPlusEleven.cpp
+++ b/tests/CPlusPlusEleven.cpp
@@ -4,9 +4,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "Test.h"
-#include "SkTemplates.h"
+
 #include "SkScopeExit.h"
+#include "SkTypes.h"
+#include "Test.h"
+
 #include <utility>
 
 namespace {
diff --git a/tests/CTest.cpp b/tests/CTest.cpp
index 1f301efa7e..425b264718 100644
--- a/tests/CTest.cpp
+++ b/tests/CTest.cpp
@@ -6,11 +6,13 @@
  */
 
 #include "Test.h"
-
 #include "sk_canvas.h"
 #include "sk_paint.h"
-#include "sk_surface.h"
 #include "sk_shader.h"
+#include "sk_surface.h"
+#include "sk_types.h"
+
+#include <stdint.h>
 
 static void shader_test(skiatest::Reporter* reporter) {
     sk_imageinfo_t info =
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index dc4a3a0ea5..669ced2111 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -6,16 +6,18 @@
  */
 
 #include "SkAutoMalloc.h"
+#include "SkBlendMode.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
-#include "SkColorPriv.h"
-#include "SkLumaColorFilter.h"
 #include "SkRandom.h"
 #include "SkReadBuffer.h"
+#include "SkRefCnt.h"
 #include "SkWriteBuffer.h"
-#include "SkRandom.h"
+#include "SkTypes.h"
 #include "Test.h"
 
+class SkFlattenable;
+
 static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) {
     SkBinaryWriteBuffer wb;
     wb.writeFlattenable(obj);
diff --git a/tests/ColorMatrixTest.cpp b/tests/ColorMatrixTest.cpp
index baef52088b..8c25669810 100644
--- a/tests/ColorMatrixTest.cpp
+++ b/tests/ColorMatrixTest.cpp
@@ -5,15 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkColorMatrixFilter.h"
+#include "SkColorFilter.h"
 #include "SkPaint.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
+#include "Test.h"
 
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 static inline void assert_color(skiatest::Reporter* reporter,
                                 SkColor expected, SkColor actual, int tolerance) {
diff --git a/tests/ColorPrivTest.cpp b/tests/ColorPrivTest.cpp
index d2045e8e4a..c43873baa4 100644
--- a/tests/ColorPrivTest.cpp
+++ b/tests/ColorPrivTest.cpp
@@ -5,9 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-
+#include "SkColor.h"
 #include "SkColorData.h"
+#include "SkColorPriv.h"
+#include "SkTypes.h"
+#include "Test.h"
 
 #define ASSERT(expr) REPORTER_ASSERT(r, expr)
 
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index e53ffd1cdc..6ec59dd01e 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -8,12 +8,20 @@
 #include "Resources.h"
 #include "SkCodec.h"
 #include "SkColorSpace.h"
-#include "SkColorSpace_XYZ.h"
 #include "SkColorSpacePriv.h"
+#include "SkColorSpace_XYZ.h"
+#include "SkData.h"
+#include "SkImageInfo.h"
+#include "SkMatrix44.h"
+#include "SkRefCnt.h"
+#include "SkStream.h"
+#include "SkTypes.h"
 #include "Test.h"
-
 #include "png.h"
 
+#include <memory>
+#include <utility>
+
 static bool almost_equal(float a, float b) {
     return SkTAbs(a - b) < 0.001f;
 }
diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index bd24f2458a..6bc44d712e 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -5,16 +5,28 @@
  * found in the LICENSE file.
  */
 
-#include "Resources.h"
-#include "SkCodec.h"
-#include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkColorSpace.h"
+#include "SkColorSpaceXform.h"
+#include "SkColorSpaceXformPriv.h"
+#include "SkColorSpaceXform_Base.h"
 #include "SkColorSpace_A2B.h"
 #include "SkColorSpace_XYZ.h"
-#include "SkColorSpaceXform_Base.h"
+#include "SkData.h"
+#include "SkGammas.h"
+#include "SkImageInfo.h"
+#include "SkMalloc.h"
+#include "SkMatrix.h"
+#include "SkMatrix44.h"
+#include "SkRefCnt.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
 #include "Test.h"
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 static constexpr int kChannels = 3;
 
 class ColorSpaceXformTest {
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 13f48ed5fe..e8bc9ecd85 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -7,8 +7,10 @@
 
 #include "SkColor.h"
 #include "SkColorData.h"
+#include "SkColorPriv.h"
 #include "SkMathPriv.h"
 #include "SkRandom.h"
+#include "SkTypes.h"
 #include "SkUnPreMultiply.h"
 #include "Test.h"
 
diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp
index 9574208564..acdc2b9f5d 100644
--- a/tests/CopySurfaceTest.cpp
+++ b/tests/CopySurfaceTest.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2016 Google Inc.
  *
@@ -6,16 +5,26 @@
  * found in the LICENSE file.
  */
 
-#include <initializer_list>
-#include "Test.h"
+#include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrContextFactory.h"
 #include "GrContextPriv.h"
+#include "GrSurfaceContext.h"
+#include "GrSurfaceProxy.h"
 #include "GrTextureProxy.h"
+#include "GrTypes.h"
 #include "ProxyUtils.h"
-
+#include "SkImageInfo.h"
+#include "SkPoint.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkTemplates.h"
 #include "SkUtils.h"
+#include "Test.h"
+
+#include <utility>
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CopySurface, reporter, ctxInfo) {
     GrContext* context = ctxInfo.grContext();