Revert "IWYU for some test files starting with 'C'."

This reverts commit 1a462bd0fe6fb3cd8d7aa7ad1d8290e764ac79e4.

Reason for revert: Broke android. Need to run android bot for these.

Original change's description:
> IWYU for some test files starting with 'C'.
> 
> Change-Id: I9a9596f7a941cdd8f01e055965c70a4b24438499
> Reviewed-on: https://skia-review.googlesource.com/113746
> Reviewed-by: Herb Derby <herb@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>

TBR=bungeman@google.com,herb@google.com

Change-Id: Ic63c2fcc7457e442e9b29a9ccd429927e24e3b77
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/113841
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

16 files changed, 46 insertions, 183 deletions

diff --git a/tests/CachedDataTest.cpp b/tests/CachedDataTest.cpp
index efb4d71c77..fe7bb5f547 100644
--- a/tests/CachedDataTest.cpp
+++ b/tests/CachedDataTest.cpp
@@ -7,15 +7,8 @@
 
 #include "SkCachedData.h"
 #include "SkDiscardableMemoryPool.h"
-#include "SkMalloc.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
 #include "Test.h"
 
-#include <cstring>
-
-class SkDiscardableMemory;
-
 enum LockedState {
     kUnlocked,
     kLocked,
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 95f9d8d09a..a44781bc2e 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -7,20 +7,19 @@
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorData.h"
+#include "SkData.h"
+#include "SkDiscardableMemoryPool.h"
 #include "SkImage.h"
+#include "SkImageEncoder.h"
 #include "SkImageGenerator.h"
-#include "SkImageInfo.h"
 #include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
+#include "SkResourceCache.h"
+#include "SkStream.h"
 #include "SkUtils.h"
+
 #include "Test.h"
 #include "sk_tool_utils.h"
 
-#include <utility>
-
 class TestImageGenerator : public SkImageGenerator {
 public:
     enum TestType {
diff --git a/tests/CanvasStateHelpers.cpp b/tests/CanvasStateHelpers.cpp
index e84615d73f..1547d2f8e0 100644
--- a/tests/CanvasStateHelpers.cpp
+++ b/tests/CanvasStateHelpers.cpp
@@ -5,19 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
-#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
 #include "CanvasStateHelpers.h"
+#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
-#include "SkClipOp.h"
-#include "SkColor.h"
 #include "SkPaint.h"
 #include "SkRect.h"
 #include "SkRegion.h"
-#include "SkScalar.h"
-
-#include <memory>
 
 void complex_layers_draw(SkCanvas* canvas, float left, float top,
                          float right, float bottom, int32_t spacer) {
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 775c15a80d..2e78d15866 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -8,27 +8,17 @@
 #include "CanvasStateHelpers.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkCanvasStateUtils.h"
 #include "SkClipOpPriv.h"
-#include "SkColor.h"
+#include "SkCanvasStateUtils.h"
 #include "SkCommandLineFlags.h"
 #include "SkDrawFilter.h"
-#include "SkImageInfo.h"
 #include "SkPaint.h"
+#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkRect.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkTDArray.h"
 #include "SkTLazy.h"
-#include "SkTypes.h"
 #include "Test.h"
 
-#include <cstring>
-#include <memory>
-
-class SkCanvasState;
-
 // dlopen and the library flag are only used for tests which require this flag.
 #ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
 #include <dlfcn.h>
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 5169119fdd..f027071b53 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -46,48 +46,29 @@
  */
 
 #include "SkBitmap.h"
-#include "SkBlendMode.h"
 #include "SkCanvas.h"
-#include "SkCanvasStack.h"
-#include "SkClipOp.h"
-#include "SkClipOpPriv.h"
-#include "SkColor.h"
+#include "SkClipStack.h"
 #include "SkDocument.h"
-#include "SkFlattenable.h"
-#include "SkImageFilter.h"
-#include "SkImageInfo.h"
-#include "SkMalloc.h"
 #include "SkMatrix.h"
 #include "SkNWayCanvas.h"
 #include "SkPaint.h"
 #include "SkPaintFilterCanvas.h"
 #include "SkPath.h"
+#include "SkPicture.h"
+#include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
-#include "SkPixmap.h"
-#include "SkPoint.h"
+#include "SkRasterClip.h"
 #include "SkRect.h"
-#include "SkRefCnt.h"
 #include "SkRegion.h"
-#include "SkScalar.h"
 #include "SkShader.h"
-#include "SkSize.h"
 #include "SkSpecialImage.h"
 #include "SkStream.h"
-#include "SkString.h"
 #include "SkSurface.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
-#include "SkTypes.h"
 #include "SkVertices.h"
 #include "Test.h"
 
-#include <memory>
-#include <utility>
-
-class SkColorSpaceXformer;
-class SkReadBuffer;
-template <typename T> class SkTCopyOnFirstWrite;
-
 DEF_TEST(canvas_clipbounds, reporter) {
     SkCanvas canvas(10, 10);
     SkIRect irect, irect2;
@@ -704,6 +685,9 @@ DEF_TEST(PaintFilterCanvas_ConsistentState, reporter) {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+#include "SkCanvasStack.h"
+#include "SkNWayCanvas.h"
+
 // Subclass that takes a bool*, which it updates in its construct (true) and destructor (false)
 // to allow the caller to know how long the object is alive.
 class LifeLineCanvas : public SkCanvas {
diff --git a/tests/ChecksumTest.cpp b/tests/ChecksumTest.cpp
index 7427187958..1882235e30 100644
--- a/tests/ChecksumTest.cpp
+++ b/tests/ChecksumTest.cpp
@@ -8,7 +8,6 @@
 #include "SkChecksum.h"
 #include "SkOpts.h"
 #include "SkRandom.h"
-#include "SkTypes.h"
 #include "Test.h"
 
 DEF_TEST(Checksum, r) {
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index 1110fddbd2..429b9e1d5d 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -5,29 +5,14 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
+#include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "GrColor.h"
 #include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextOptions.h"
-#include "GrContextPriv.h"
 #include "GrRenderTargetContext.h"
-#include "GrTypes.h"
-#include "SkBitmap.h"
+
 #include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkImageInfo.h"
-#include "SkPaint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
 #include "SkSurface.h"
-#include "Test.h"
-
-#include <cstring>
-#include <memory>
 
 static bool check_rect(GrRenderTargetContext* rtc, const SkIRect& rect, uint32_t expectedValue,
                        uint32_t* actualValue, int* failX, int* failY) {
diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp
index d6169022ff..e8aae38994 100644
--- a/tests/ClipBoundsTest.cpp
+++ b/tests/ClipBoundsTest.cpp
@@ -5,16 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
-
+#include "Test.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
 #include "GrClipStackClip.h"
-#include "SkClipOpPriv.h"
-#include "SkClipStack.h"
-#include "SkMatrix.h"
-#include "SkRect.h"
-#include "Test.h"
+#include "GrContext.h"
 
 // Ensure that the 'getConservativeBounds' calls are returning bounds clamped
 // to the render target
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index a2024ff6cd..854ac32dd1 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -7,17 +7,10 @@
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColor.h"
 #include "SkCubicClipper.h"
-#include "SkFloatBits.h"
+#include "SkGeometry.h"
 #include "SkPaint.h"
 #include "SkPath.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
 #include "Test.h"
 
 // Currently the supersampler blitter uses int16_t for its index into an array
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index eeef831df1..fb46681f0f 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -5,39 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "SkCanvas.h"
-#include "SkClipOp.h"
-#include "SkClipOpPriv.h"
+#include "Test.h"
 #include "SkClipStack.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
 #include "SkPath.h"
-#include "SkPoint.h"
-#include "SkRRect.h"
 #include "SkRandom.h"
 #include "SkRect.h"
-#include "SkRefCnt.h"
 #include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkSurface.h"
-#include "SkTLList.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-#include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "GrCaps.h"
-#include "GrClip.h"
 #include "GrClipStackClip.h"
-#include "GrConfig.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
 #include "GrReducedClip.h"
 #include "GrResourceCache.h"
-#include "GrResourceKey.h"
 #include "GrSurfaceProxyPriv.h"
 #include "GrTexture.h"
 #include "GrTextureProxy.h"
@@ -45,9 +23,6 @@ typedef GrReducedClip::ElementList ElementList;
 typedef GrReducedClip::InitialState InitialState;
 #endif
 
-#include <cstring>
-#include <new>
-
 static void test_assign_and_comparison(skiatest::Reporter* reporter) {
     SkClipStack s;
     bool doAA = false;
@@ -1535,6 +1510,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) {
 #endif
 }
 
+#include "SkSurface.h"
 DEF_GPUTEST_FOR_ALL_CONTEXTS(canvas_private_clipRgn, reporter, ctxInfo) {
     GrContext* context = ctxInfo.grContext();
 
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 0bb5212581..641ed013be 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -7,18 +7,11 @@
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkColor.h"
 #include "SkEdgeClipper.h"
 #include "SkLineClipper.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkScalar.h"
-#include "SkTypes.h"
+#include "SkPath.h"
 #include "Test.h"
 
-#include <cstring>
-
 static void test_hairclipping(skiatest::Reporter* reporter) {
     SkBitmap bm;
     bm.allocN32Pixels(4, 4);
diff --git a/tests/CodecAnimTest.cpp b/tests/CodecAnimTest.cpp
index a3e16c6aa5..c5c65f8468 100644
--- a/tests/CodecAnimTest.cpp
+++ b/tests/CodecAnimTest.cpp
@@ -5,24 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "CodecPriv.h"
-#include "Resources.h"
 #include "SkAndroidCodec.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
-#include "SkCodecAnimation.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkTypes.h"
+#include "SkStream.h"
+
+#include "CodecPriv.h"
+#include "Resources.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
-#include <cstring>
-#include <memory>
-#include <utility>
+#include <initializer_list>
 #include <vector>
 
 DEF_TEST(Codec_trunc, r) {
diff --git a/tests/CodecExactReadTest.cpp b/tests/CodecExactReadTest.cpp
index 86702a1f81..6189bdfd53 100644
--- a/tests/CodecExactReadTest.cpp
+++ b/tests/CodecExactReadTest.cpp
@@ -6,19 +6,13 @@
  */
 
 #include "Resources.h"
+#include "Test.h"
+
 #include "SkBitmap.h"
 #include "SkCodec.h"
 #include "SkData.h"
-#include "SkImageInfo.h"
 #include "SkMakeUnique.h"
-#include "SkRefCnt.h"
 #include "SkStream.h"
-#include "SkTemplates.h"
-#include "Test.h"
-
-#include <cstring>
-#include <memory>
-#include <utility>
 
 namespace {
 // This class wraps another SkStream. It does not own the underlying stream, so
diff --git a/tests/CodecPartialTest.cpp b/tests/CodecPartialTest.cpp
index f33f8ba513..561dddd875 100644
--- a/tests/CodecPartialTest.cpp
+++ b/tests/CodecPartialTest.cpp
@@ -5,22 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "FakeStreams.h"
-#include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
 #include "SkData.h"
 #include "SkImageInfo.h"
 #include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "SkRWBuffer.h"
+#include "SkString.h"
 
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
+#include "FakeStreams.h"
+#include "Resources.h"
+#include "Test.h"
 
 static SkImageInfo standardize_info(SkCodec* codec) {
     SkImageInfo defaultInfo = codec->getInfo();
diff --git a/tests/CodecRecommendedTypeTest.cpp b/tests/CodecRecommendedTypeTest.cpp
index 6ba1157829..180bf2f8da 100644
--- a/tests/CodecRecommendedTypeTest.cpp
+++ b/tests/CodecRecommendedTypeTest.cpp
@@ -7,17 +7,14 @@
 
 #include "SkAndroidCodec.h"
 #include "SkBitmap.h"
-#include "SkColor.h"
+#include "SkCodec.h"
 #include "SkColorSpace.h"
-#include "SkData.h"
 #include "SkEncodedImageFormat.h"
 #include "SkImageEncoder.h"
 #include "SkImageInfo.h"
 #include "SkStream.h"
-#include "Test.h"
 
-#include <memory>
-#include <utility>
+#include "Test.h"
 
 DEF_TEST(Codec_recommendedF16, r) {
     // Encode an F16 bitmap. SkEncodeImage will encode this to a true-color PNG
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index e83988a4b1..d8dab25a90 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -13,45 +13,28 @@
 #include "SkCanvas.h"
 #include "SkCodec.h"
 #include "SkCodecImageGenerator.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
+#include "SkColorSpace_XYZ.h"
 #include "SkColorSpacePriv.h"
 #include "SkData.h"
-#include "SkEncodedImageFormat.h"
 #include "SkFrontBufferedStream.h"
-#include "SkImage.h"
-#include "SkImageGenerator.h"
-#include "SkImageInfo.h"
-#include "SkJpegEncoder.h"
-#include "SkMD5.h"
+#include "SkImageEncoder.h"
+#include "SkImageEncoderPriv.h"
 #include "SkMakeUnique.h"
-#include "SkMalloc.h"
-#include "SkMatrix44.h"
-#include "SkPixmap.h"
+#include "SkMD5.h"
+#include "SkOSPath.h"
+#include "SkJpegEncoder.h"
 #include "SkPngChunkReader.h"
 #include "SkPngEncoder.h"
 #include "SkRandom.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
-#include "SkString.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
 #include "SkUnPreMultiply.h"
 #include "SkWebpEncoder.h"
 #include "Test.h"
+
 #include "png.h"
-#include "pngconf.h"
-#include "scripts/pnglibconf.h.prebuilt"
-#include "sk_tool_utils.h"
 
-#include <setjmp.h>
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
+#include "sk_tool_utils.h"
 
 #if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 5
     // FIXME (scroggo): Google3 needs to be updated to use a newer version of libpng. In