Cleanup: Sanitize the order of includes under tests/

Initially this was to make sure Test.h appeared after the Sk*.h includes.

Patch generated by the following command line:

$ ~/chromium/src/tools/sort-headers.py tests/*.cpp

BUG=None
TEST=tests
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/145313004

git-svn-id: http://skia.googlecode.com/svn/trunk@13177 2bbb7eff-a529-9590-31e7-b0007b416f81

106 files changed, 148 insertions, 146 deletions

diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index cc5c17b628..961d57ad6b 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkAAClip.h"
 #include "SkCanvas.h"
 #include "SkMask.h"
 #include "SkPath.h"
 #include "SkRandom.h"
+#include "Test.h"
 
 static bool operator==(const SkMask& a, const SkMask& b) {
     if (a.fFormat != b.fFormat || a.fBounds != b.fBounds) {
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
index 0c0f9db93b..49bab05576 100644
--- a/tests/AndroidPaintTest.cpp
+++ b/tests/AndroidPaintTest.cpp
@@ -1,10 +1,10 @@
 // SkPaints only have an SkPaintOptionsAndroid if SK_BUILD_FOR_ANDROID is true.
 #ifdef SK_BUILD_FOR_ANDROID
 
-#include "SkPaintOptionsAndroid.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkPaint.h"
+#include "SkPaintOptionsAndroid.h"
 #include "Test.h"
 
 static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index 6d3720d0fe..3d146649a1 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -5,12 +5,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "Test.h"
 #include "SkAnnotation.h"
-#include "SkData.h"
 #include "SkCanvas.h"
+#include "SkData.h"
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"
+#include "Test.h"
 
 /** Returns true if data (may contain null characters) contains needle (null
  *  terminated). */
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index 9d5f0e6e14..8b5ac9b679 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkThread.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
+#include "Test.h"
 
 struct AddInfo {
     int32_t valueToAdd;
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index f1ebb364b3..da023763ba 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitSet.h"
+#include "Test.h"
 
 DEF_TEST(BitSet, reporter) {
     SkBitSet set0(65536);
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 9e96c33a42..57ac95009f 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -4,9 +4,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
+#include "Test.h"
 
 static const char* boolStr(bool value) {
     return value ? "true" : "false";
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 79dddbbc3b..8df8661b05 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
-#include "SkRect.h"
 #include "SkRandom.h"
+#include "SkRect.h"
+#include "Test.h"
 
 DEF_TEST(GetColor, reporter) {
     static const struct Rec {
diff --git a/tests/BlitRowTest.cpp b/tests/BlitRowTest.cpp
index 3f3f529462..9ab620e904 100644
--- a/tests/BlitRowTest.cpp
+++ b/tests/BlitRowTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
 #include "SkRect.h"
+#include "Test.h"
 
 // these are in the same order as the SkBitmap::Config enum
 static const char* gConfigName[] = {
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index d725ff5fc9..a04ebe637d 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -6,12 +6,12 @@
  */
 
 #include "SkBitmap.h"
+#include "SkCachingPixelRef.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkImageDecoder.h"
-#include "SkCachingPixelRef.h"
 #include "SkScaledImageCache.h"
 #include "SkStream.h"
 #include "SkUtils.h"
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 4d39d9e279..f1c35929d6 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
 #include "SkDrawFilter.h"
 #include "SkError.h"
 #include "SkPaint.h"
-#include "SkRect.h"
 #include "SkRRect.h"
+#include "SkRect.h"
+#include "Test.h"
 
 static void test_complex_layers(skiatest::Reporter* reporter) {
     const int WIDTH = 400;
diff --git a/tests/ClampRangeTest.cpp b/tests/ClampRangeTest.cpp
index 16ca525a88..b8059bc485 100644
--- a/tests/ClampRangeTest.cpp
+++ b/tests/ClampRangeTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkRandom.h"
 #include "Test.h"
 #include "gradients/SkClampRange.h"
-#include "SkRandom.h"
 
 static skiatest::Reporter* gReporter;
 
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 15a1332b85..77f0137d5a 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -8,9 +8,9 @@
 #include "Test.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
+#include "../../src/gpu/GrClipMaskManager.h"
 #include "GrContextFactory.h"
 #include "SkGpuDevice.h"
-#include "../../src/gpu/GrClipMaskManager.h"
 
 static const int X_SIZE = 12;
 static const int Y_SIZE = 12;
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 05ced3df88..db6ae80293 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCanvas.h"
-#include "SkPaint.h"
 #include "SkCubicClipper.h"
 #include "SkGeometry.h"
+#include "SkPaint.h"
+#include "Test.h"
 
 // Currently the supersampler blitter uses int16_t for its index into an array
 // the width of the clip. Test that we don't crash/assert if we try to draw
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 6f72068a63..c8f65db197 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCanvas.h"
 #include "SkEdgeClipper.h"
 #include "SkLineClipper.h"
 #include "SkPath.h"
+#include "Test.h"
 
 static void test_hairclipping(skiatest::Reporter* reporter) {
     SkBitmap bm;
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 4d2f815439..e8cf8ba019 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
 #include "SkColorFilter.h"
+#include "SkColorPriv.h"
 #include "SkLumaColorFilter.h"
-#include "SkRandom.h"
-#include "SkXfermode.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
+#include "SkRandom.h"
+#include "SkXfermode.h"
+#include "Test.h"
 
 static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) {
     SkOrderedWriteBuffer wb;
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 64f2785035..5a6f0fbce3 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
 #include "SkRandom.h"
 #include "SkUnPreMultiply.h"
+#include "Test.h"
 
 #define GetPackedR16As32(packed)    (SkGetPackedR16(dc) << (8 - SK_R16_BITS))
 #define GetPackedG16As32(packed)    (SkGetPackedG16(dc) << (8 - SK_G16_BITS))
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index e4c0a6b39a..731e4484c5 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -5,13 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkData.h"
 #include "SkDataTable.h"
+#include "SkOSFile.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
-#include "SkOSFile.h"
 #include "SkStream.h"
+#include "Test.h"
 
 static void test_is_equal(skiatest::Reporter* reporter,
                           const SkDataTable* a, const SkDataTable* b) {
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index df7c658f19..d15eeffd5c 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
+#include "../src/image/SkImagePriv.h"
+#include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapProcShader.h"
 #include "SkDeferredCanvas.h"
 #include "SkGradientShader.h"
 #include "SkShader.h"
-#include "../src/image/SkSurface_Base.h"
-#include "../src/image/SkImagePriv.h"
+#include "Test.h"
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #else
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index 8a836d39c3..5d5dc09176 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkDeque.h"
+#include "Test.h"
 
 static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
     if (0 == count) {
diff --git a/tests/DeviceLooperTest.cpp b/tests/DeviceLooperTest.cpp
index bd1aa09d05..ab5841b1bd 100644
--- a/tests/DeviceLooperTest.cpp
+++ b/tests/DeviceLooperTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkDeviceLooper.h"
 #include "SkRasterClip.h"
+#include "Test.h"
 
 static void make_bm(SkBitmap* bm, int w, int h) {
     bm->setConfig(SkBitmap::kA8_Config, w, h);
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index 2b5e420bd0..a1681461cb 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -5,17 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkImageGenerator.h"
+#include "SkMatrixUtils.h"
 #include "SkPaint.h"
+#include "SkRandom.h"
 #include "SkShader.h"
 #include "SkSurface.h"
-#include "SkRandom.h"
-#include "SkMatrixUtils.h"
+#include "Test.h"
 
 // A BitmapFactory that always fails when asked to return pixels.
 class FailureImageGenerator : public SkImageGenerator {
diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp
index ac015b6191..2cf1bc5c41 100644
--- a/tests/DrawPathTest.cpp
+++ b/tests/DrawPathTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDashPathEffect.h"
 #include "SkSurface.h"
+#include "Test.h"
 
 static SkCanvas* create(SkBitmap::Config config, int w, int h, int rb,
                         void* addr = NULL) {
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 93f4b61e4e..bafd2cb5e2 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ -13,6 +12,7 @@
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkTypes.h"
+#include "Test.h"
 
 static const SkColor bgColor = SK_ColorWHITE;
 
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index 4202270beb..db6622d7a7 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkTDynamicHash.h"
+#include "Test.h"
 
 namespace {
 
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index d0d31bf7a3..09a1f5279c 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkPath.h"
 #include "SkCanvas.h"
+#include "SkPath.h"
+#include "Test.h"
 
 #define DIMENSION   32
 
diff --git a/tests/ErrorTest.cpp b/tests/ErrorTest.cpp
index 352520574f..89e920a885 100644
--- a/tests/ErrorTest.cpp
+++ b/tests/ErrorTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkError.h"
 #include "SkPath.h"
 #include "SkRect.h"
+#include "Test.h"
 
 typedef struct {
     skiatest::Reporter *fReporter;
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index 20b47cafb2..cc8d329652 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkRegion.h"
+#include "SkBlitter.h"
 #include "SkPath.h"
+#include "SkRegion.h"
 #include "SkScan.h"
-#include "SkBlitter.h"
+#include "Test.h"
 
 struct FakeBlitter : public SkBlitter {
   FakeBlitter()
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
index 4db81dd3e3..6a46b67bed 100644
--- a/tests/FitsInTest.cpp
+++ b/tests/FitsInTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkTypes.h"
 #include "SkTFitsIn.h"
+#include "SkTypes.h"
+#include "Test.h"
 
 #include <limits>
 
diff --git a/tests/FlatDataTest.cpp b/tests/FlatDataTest.cpp
index 54427f4116..1f0e12a34f 100644
--- a/tests/FlatDataTest.cpp
+++ b/tests/FlatDataTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ -15,6 +14,7 @@
 #include "SkPictureFlat.h"
 #include "SkShader.h"
 #include "SkXfermode.h"
+#include "Test.h"
 
 struct SkFlattenableTraits {
     static void flatten(SkOrderedWriteBuffer& buffer, const SkFlattenable& flattenable) {
diff --git a/tests/FlateTest.cpp b/tests/FlateTest.cpp
index 22c70ab886..aacde34a1b 100644
--- a/tests/FlateTest.cpp
+++ b/tests/FlateTest.cpp
@@ -8,10 +8,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "Test.h"
 #include "SkData.h"
 #include "SkFlate.h"
 #include "SkStream.h"
+#include "Test.h"
 
 // A memory stream that reports zero size with the standard call, like
 // an unseekable file stream would.
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index 3f50a921ce..a5f9ade4d1 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ -17,6 +16,7 @@
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTypes.h"
+#include "Test.h"
 
 static const SkColor bgColor = SK_ColorWHITE;
 
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index f9e23c80d6..bc87aaa754 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -5,13 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkPaint.h"
+#include "SkEndian.h"
 #include "SkFontStream.h"
 #include "SkOSFile.h"
+#include "SkPaint.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
-#include "SkEndian.h"
+#include "Test.h"
 
 //#define DUMP_TABLES
 //#define DUMP_TTC_TABLES
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 32c61db495..afe618c201 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkTypeface.h"
+#include "Test.h"
 
 /*
  *  If the font backend is going to "alias" some font names to other fonts
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index ddae1388ce..e4966b07a7 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkOTTable_name.h"
 #include "SkTypeface.h"
+#include "Test.h"
 
 #include <stddef.h>
 
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index d2290f22ed..9f6085449e 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkFrontBufferedStream.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTypes.h"
+#include "Test.h"
 
 static void test_read(skiatest::Reporter* reporter, SkStream* bufferedStream,
                       const void* expectations, size_t bytesToRead) {
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 236a9b37fd..6c4aace96f 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -12,11 +12,11 @@
 
 #if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
-#include "gl/GrGpuGL.h"
 #include "GrBackendEffectFactory.h"
 #include "GrContextFactory.h"
 #include "GrDrawEffect.h"
 #include "effects/GrConfigConversionEffect.h"
+#include "gl/GrGpuGL.h"
 
 #include "SkChecksum.h"
 #include "SkRandom.h"
@@ -249,9 +249,9 @@ DEF_GPUTEST(GLPrograms, reporter, factory) {
 // We force some of the effects that would otherwise be discarded to link here.
 
 #include "SkAlphaThresholdFilter.h"
+#include "SkColorMatrixFilter.h"
 #include "SkLightingImageFilter.h"
 #include "SkMagnifierImageFilter.h"
-#include "SkColorMatrixFilter.h"
 
 void forceLinking();
 
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index 01ac4d7a72..5151b70805 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkGeometry.h"
+#include "Test.h"
 
 static bool nearly_equal(const SkPoint& a, const SkPoint& b) {
     return SkScalarNearlyEqual(a.fX, b.fX) && SkScalarNearlyEqual(a.fY, b.fY);
diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp
index 7d5d56cc13..e2e03845ca 100644
--- a/tests/GifTest.cpp
+++ b/tests/GifTest.cpp
@@ -11,13 +11,13 @@
     (!defined(SK_BUILD_FOR_IOS)) &&             \
     (!defined(SK_BUILD_FOR_MAC))
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkImage.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
+#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index eb83db378c..3dcba52bd9 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -14,8 +14,8 @@
 #include "SkColor.h"
 #include "SkGpuDevice.h"
 #include "SkPaint.h"
-#include "SkRect.h"
 #include "SkRRect.h"
+#include "SkRect.h"
 #include "Test.h"
 
 static void test_drawPathEmpty(skiatest::Reporter*, SkCanvas* canvas) {
diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp
index 68f922fbb1..c032d88bd0 100644
--- a/tests/GrDrawTargetTest.cpp
+++ b/tests/GrDrawTargetTest.cpp
@@ -10,8 +10,8 @@
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
-#include "GrGpu.h"
 #include "GrDrawTargetCaps.h"
+#include "GrGpu.h"
 #include "Test.h"
 
 static void test_print(skiatest::Reporter*, const GrDrawTargetCaps* caps) {
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index faf5ca179e..0848d97f74 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -9,10 +9,10 @@
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
 #include "GrMemoryPool.h"
+#include "SkInstCnt.h"
 #include "SkRandom.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
-#include "SkInstCnt.h"
 
 // A is the top of an inheritance tree of classes that overload op new and
 // and delete to use a GrMemoryPool. The objects have values of different types
diff --git a/tests/GrUnitTests.cpp b/tests/GrUnitTests.cpp
index ddb5ead6c0..0d02da7cee 100644
--- a/tests/GrUnitTests.cpp
+++ b/tests/GrUnitTests.cpp
@@ -11,8 +11,8 @@
 #if SK_SUPPORT_GPU
 #include "GrBinHashKey.h"
 #include "GrDrawTarget.h"
-#include "SkMatrix.h"
 #include "GrRedBlackTree.h"
+#include "SkMatrix.h"
 
 // If we aren't inheriting these as #defines from elsewhere,
 // clang demands they be declared before we #include the template
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index da9ac7f808..8a250fab79 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -5,13 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
 #include "SkGradientShader.h"
 #include "SkShader.h"
 #include "SkTemplates.h"
+#include "Test.h"
 
 struct GradRec {
     int             fColorCount;
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index 06e5ab86ed..15b624aa87 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
+#include "Test.h"
 
 static void make_bm(SkBitmap* bm, int w, int h) {
     bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 57990a520e..81f900660d 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ -24,6 +23,7 @@
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkString.h"
+#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 3f984c4705..f936a7a300 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -5,26 +5,26 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBicubicImageFilter.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
+#include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
-#include "SkColorMatrixFilter.h"
 #include "SkColorFilterImageFilter.h"
+#include "SkColorMatrixFilter.h"
 #include "SkDeviceImageFilterProxy.h"
-#include "SkBlurImageFilter.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkLightingImageFilter.h"
+#include "SkMatrixConvolutionImageFilter.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
-#include "SkMatrixConvolutionImageFilter.h"
 #include "SkOffsetImageFilter.h"
+#include "SkRect.h"
 #include "SkTileImageFilter.h"
 #include "SkXfermodeImageFilter.h"
-#include "SkRect.h"
+#include "Test.h"
 
 static const int kBitmapSize = 4;
 
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index 9202ff9dbf..3da0e5e902 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkRect.h"
+#include "Test.h"
 
 static float make_zero() {
     return sk_float_sin(0);
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index 36a7a11d73..2897883da3 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -5,13 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
-#include "SkImageDecoder.h"
 #include "SkImage.h"
+#include "SkImageDecoder.h"
 #include "SkStream.h"
+#include "Test.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index 4c6ff59ee6..20151c33ec 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
+#include "Test.h"
 
 class ListElement {
 public:
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index d6ff92e80c..a1319a50de 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
@@ -17,6 +16,7 @@
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkXfermode.h"
+#include "Test.h"
 
 class FakeDevice : public SkBitmapDevice {
 public:
diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index ae827f7a6b..efad26d485 100644
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMD5.h"
+#include "Test.h"
 
 static bool digests_equal(const SkMD5::Digest& expectedDigest, const SkMD5::Digest& computedDigest) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(expectedDigest.data); ++i) {
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 1d73d582c9..4205ce6cf5 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkColorPriv.h"
 #include "SkEndian.h"
 #include "SkFloatBits.h"
@@ -13,6 +12,7 @@
 #include "SkMathPriv.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
+#include "Test.h"
 
 static void test_clz(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, 32 == SkCLZ(0));
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index e22c9d4b8f..443086dbef 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMatrix44.h"
+#include "Test.h"
 
 static bool nearly_equal_double(double a, double b) {
     const double tolerance = 1e-7;
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 26bb122194..9e39d5b22b 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMath.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
 #include "SkRandom.h"
+#include "Test.h"
 
 static bool nearly_equal_scalar(SkScalar a, SkScalar b) {
     const SkScalar tolerance = SK_Scalar1 / 200000;
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index 73d50ee4b2..ee6aaea94e 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkChunkAlloc.h"
 #include "SkUtils.h"
+#include "Test.h"
 
 static void test_chunkalloc(skiatest::Reporter* reporter) {
     size_t min = 256;
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 5f9f340821..eb7eae9e0f 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMetaData.h"
+#include "Test.h"
 
 static void test_ptrs(skiatest::Reporter* reporter) {
     SkRefCnt ref;
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp
index 1c2771bc9c..aca6973e19 100644
--- a/tests/MipMapTest.cpp
+++ b/tests/MipMapTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkMipMap.h"
 #include "SkBitmap.h"
+#include "SkMipMap.h"
 #include "SkRandom.h"
+#include "Test.h"
 
 static void make_bitmap(SkBitmap* bm, SkRandom& rand) {
     // for now, Build needs a min size of 2, otherwise it will return NULL.
diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index c082462ff9..d36b7cb0cf 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkString.h"
 #include "SkOSFile.h"
+#include "SkString.h"
+#include "Test.h"
 
 /**
  *  Test SkPathJoin and SkBasename.
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 15093657e1..b05d4c84fe 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ -19,6 +18,7 @@
 #include "SkScalar.h"
 #include "SkStream.h"
 #include "SkTypes.h"
+#include "Test.h"
 
 class SkPDFTestDict : public SkPDFDict {
 public:
diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index 017e341f66..2af4f1867d 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkPackBits.h"
+#include "Test.h"
 
 static const uint16_t gTest0[] = { 0, 0, 1, 1 };
 static const uint16_t gTest1[] = { 1, 2, 3, 4, 5, 6 };
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 2a6bad4542..3210e77f19 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -5,15 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
-#include "SkPath.h"
 #include "SkPaint.h"
+#include "SkPath.h"
 #include "SkRandom.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
+#include "Test.h"
 
 static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) {
     char* u8 = (char*)dst;
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index 23b8919e3c..ff43d1445c 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkParsePath.h"
+#include "Test.h"
 
 static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
     SkString str, str2;
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index cc0db7cb27..0e4a1539f2 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMath.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
+#include "Test.h"
 
 /*
    Duplicates lots of code from gpu/src/GrPathUtils.cpp
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 00a3e2ef48..578f4eb74f 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkPathMeasure.h"
+#include "Test.h"
 
 static void test_small_segment3() {
     SkPath path;
diff --git a/tests/PathOpsCubicIntersectionTestData.cpp b/tests/PathOpsCubicIntersectionTestData.cpp
index aafc613088..31056d2552 100644
--- a/tests/PathOpsCubicIntersectionTestData.cpp
+++ b/tests/PathOpsCubicIntersectionTestData.cpp
@@ -4,7 +4,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "PathOpsCubicIntersectionTestData.h"
+
 #include <limits>
 
 static const double D = FLT_EPSILON / 2;
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index 8bcc883570..cff6bd3842 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -4,8 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkPathOps.h"
 #include "SkPath.h"
+#include "SkPathOps.h"
 #include "SkPoint.h"
 #include "Test.h"
 
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 33d8da4419..1af5bd3c46 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -5,20 +5,20 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
-#include "SkPath.h"
 #include "SkParse.h"
 #include "SkParsePath.h"
+#include "SkPath.h"
 #include "SkPathEffect.h"
+#include "SkRRect.h"
 #include "SkRandom.h"
 #include "SkReader32.h"
-#include "SkRRect.h"
 #include "SkSize.h"
 #include "SkSurface.h"
 #include "SkTypes.h"
 #include "SkWriter32.h"
+#include "Test.h"
 
 static void make_path0(SkPath* path) {
     // from  *  https://code.google.com/p/skia/issues/detail?id=1706
diff --git a/tests/PathUtilsTest.cpp b/tests/PathUtilsTest.cpp
index 65b742c84d..872af0b363 100644
--- a/tests/PathUtilsTest.cpp
+++ b/tests/PathUtilsTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPathUtils.h"
 #include "SkRandom.h"
 #include "SkTime.h"
+#include "Test.h"
 
 const int kNumIt = 100;
 
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 2bdcfb3461..5aaf73bdfb 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ -17,10 +16,11 @@
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureUtils.h"
-#include "SkRandom.h"
 #include "SkRRect.h"
+#include "SkRandom.h"
 #include "SkShader.h"
 #include "SkStream.h"
+#include "Test.h"
 
 static const int gColorScale = 30;
 static const int gColorOffset = 60;
diff --git a/tests/PictureUtilsTest.cpp b/tests/PictureUtilsTest.cpp
index 8cf013cf6d..069e852e9a 100644
--- a/tests/PictureUtilsTest.cpp
+++ b/tests/PictureUtilsTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkString.h"
 #include "Test.h"
 #include "picture_utils.h"
-#include "SkString.h"
 
 static void test_filepath_creation(skiatest::Reporter* reporter) {
     SkString result;
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index 579f7365c2..6ab4d8eb4b 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -5,13 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SamplePipeControllers.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGPipe.h"
 #include "SkPaint.h"
 #include "SkShader.h"
+#include "Test.h"
 
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index 1e9bbe7a3b..c0bdf54c25 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -1,7 +1,7 @@
 #include "Test.h"
 
-#include "SkPixelRef.h"
 #include "SkMallocPixelRef.h"
+#include "SkPixelRef.h"
 
 static void test_info(skiatest::Reporter* reporter) {
     static const struct {
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 9546924b84..5c1b8776c2 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCanvas.h"
 #include "SkDrawLooper.h"
+#include "Test.h"
 
 /*
  *  Subclass of looper that just draws once, with an offset in X.
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index a78e7462f1..ae8c005170 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkRandom.h"
 #include "SkRTree.h"
+#include "SkRandom.h"
 #include "SkTSort.h"
+#include "Test.h"
 
 static const size_t MIN_CHILDREN = 6;
 static const size_t MAX_CHILDREN = 11;
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index 4aa39a3fde..8d93d87df6 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
+#include "Test.h"
 
 static bool anderson_darling_test(double p[32]) {
     // Min and max Anderson-Darling values allowable for k=32
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 32676debae..5f25007d4b 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -13,8 +13,8 @@
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "SkGpuDevice.h"
 #include "GrContextFactory.h"
+#include "SkGpuDevice.h"
 #endif
 
 static const int DEV_W = 100, DEV_H = 100;
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index d557f32715..cfa08b3c1f 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkReader32.h"
+#include "Test.h"
 
 static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
     REPORTER_ASSERT(reporter, reader.eof());
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index 19973f759d..bd4f348fba 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRefCnt.h"
 #include "SkTRefArray.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
 #include "SkWeakRefCnt.h"
+#include "Test.h"
 
 class InstCounterClass {
 public:
diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
index b9f4a9aae3..1e18a6815d 100644
--- a/tests/RefDictTest.cpp
+++ b/tests/RefDictTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRefDict.h"
+#include "Test.h"
 
 class TestRC : public SkRefCnt {
 public:
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index 814a7d45d0..ae58ae6e2e 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkRegion.h"
 #include "SkRandom.h"
+#include "SkRegion.h"
+#include "Test.h"
 
 static void Union(SkRegion* rgn, const SkIRect& rect) {
     rgn->op(rect, SkRegion::kUnion_Op);
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 891b039838..9b2eecd19c 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkMatrix.h"
 #include "SkRRect.h"
+#include "Test.h"
 
 static const SkScalar kWidth = 100.0f;
 static const SkScalar kHeight = 100.0f;
diff --git a/tests/SHA1Test.cpp b/tests/SHA1Test.cpp
index d189c1ccf2..fd5fcb7efa 100644
--- a/tests/SHA1Test.cpp
+++ b/tests/SHA1Test.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkSHA1.h"
+#include "Test.h"
 
 static bool digests_equal(const SkSHA1::Digest& expectedDigest, const SkSHA1::Digest& computedDigest) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(expectedDigest.data); ++i) {
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index 08f5d66834..82f61ec5c5 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkFloatingPoint.h"
 #include "SkMath.h"
 #include "SkPoint.h"
 #include "SkRandom.h"
 #include "SkRect.h"
+#include "Test.h"
 
 struct PointSet {
     const SkPoint* fPts;
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index ee7875a747..76612b6318 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
@@ -13,6 +12,7 @@
 #include "SkOrderedWriteBuffer.h"
 #include "SkValidatingReadBuffer.h"
 #include "SkXfermodeImageFilter.h"
+#include "Test.h"
 
 static const uint32_t kArraySize = 64;
 
diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp
index bf5b2753ee..96beed51a1 100644
--- a/tests/ShaderImageFilterTest.cpp
+++ b/tests/ShaderImageFilterTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkCanvas.h"
-#include "SkShader.h"
-#include "SkRectShaderImageFilter.h"
 #include "SkGradientShader.h"
+#include "SkRectShaderImageFilter.h"
+#include "SkShader.h"
+#include "Test.h"
 
 DEF_TEST(ShaderImageFilter, reporter) {
     int w = 10, h = 10;
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index 3e67306332..5230e4a0fa 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkShader.h"
-#include "SkGradientShader.h"
 #include "SkColorShader.h"
+#include "SkGradientShader.h"
+#include "SkShader.h"
+#include "Test.h"
 
 static void test_bitmap(skiatest::Reporter* reporter) {
     SkBitmap bmp;
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index c22b50f1fb..2c01a7e42a 100755..100644
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -9,17 +9,17 @@
 #include "gl/GrGLDefines.h"
 
 #include "SkBitmap.h"
+#include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkDevice.h"
-#include "SkCanvas.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
-#include "SkStream.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkRTConf.h"
 #include "SkRunnable.h"
+#include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
diff --git a/tests/SortTest.cpp b/tests/SortTest.cpp
index 198e3cf8da..e8713dd4d2 100644
--- a/tests/SortTest.cpp
+++ b/tests/SortTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
+#include "Test.h"
 
 extern "C" {
     static int compare_int(const void* a, const void* b) {
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index 91a9c81376..be64710404 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkColorPriv.h"
 #include "SkXfermode.h"
+#include "Test.h"
 
 // our std SkAlpha255To256
 static int test_srcover0(unsigned dst, unsigned alpha) {
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index ecb8336596..7cf3126d61 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkRandom.h"
+#include "SkData.h"
 #include "SkOSFile.h"
+#include "SkRandom.h"
 #include "SkStream.h"
-#include "SkData.h"
+#include "Test.h"
 
 #ifndef SK_BUILD_FOR_WIN
 #include <unistd.h>
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index a911a85733..13ee5ec215 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-#include "SkString.h"
 #include <stdarg.h>
 #include <stdio.h>
+#include "SkString.h"
+#include "Test.h"
 
 // Windows vsnprintf doesn't 0-terminate safely), but is so far
 // encapsulated in SkString that we can't test it directly.
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 2a28fa4495..15220c4a3b 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRect.h"
 #include "SkStroke.h"
+#include "Test.h"
 
 static bool equal(const SkRect& a, const SkRect& b) {
     return  SkScalarNearlyEqual(a.left(), b.left()) &&
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index 1e6b616de4..53bb5fe842 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkTLS.h"
 #include "SkThreadUtils.h"
+#include "Test.h"
 
 static void thread_main(void*) {
     SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024);
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index dc536332bd..3f826480ad 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkTSet.h"
+#include "Test.h"
 
 // Tests the SkTSet<T> class template.
 // Functions that just call SkTDArray are not tested.
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 994a342128..daa23b132c 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -7,10 +7,10 @@
  */
 #include "Test.h"
 
+#include "SkError.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTime.h"
-#include "SkError.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 76a96e7ba2..466a628c5c 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkSize.h"
+#include "Test.h"
 
 static void TestISize(skiatest::Reporter* reporter) {
     SkISize  a, b;
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index c86a2bd79e..37952b4ba0 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkTileGrid.h"
 #include "SkTileGridPicture.h"
+#include "Test.h"
 
 enum Tile {
     kTopLeft_Tile = 0x1,
diff --git a/tests/ToUnicode.cpp b/tests/ToUnicode.cpp
index 71b8592d21..919ba11f58 100644
--- a/tests/ToUnicode.cpp
+++ b/tests/ToUnicode.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkData.h"
-#include "SkPDFTypes.h"
 #include "SkPDFFont.h"
+#include "SkPDFTypes.h"
 #include "SkStream.h"
+#include "Test.h"
 
 static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
                           const char* buffer, size_t len) {
diff --git a/tests/Typeface.cpp b/tests/Typeface.cpp
index 93f1627aad..bb5d361bee 100644
--- a/tests/Typeface.cpp
+++ b/tests/Typeface.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkTypeface.h"
+#include "Test.h"
 
 DEF_TEST(Typeface, reporter) {
 
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index dc5bc158bd..5ed92d4b34 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
+#include "Test.h"
 
 // Unicode Variation Selector ranges: inclusive
 #define UVS_MIN0    0x180B
diff --git a/tests/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index d0ed6a112e..35432cd91d 100644
--- a/tests/UnitTestTest.cpp
+++ b/tests/UnitTestTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRTConf.h"
+#include "Test.h"
 
 DEF_TEST(UnitTest, reporter) {
 #ifdef SK_SUPPORT_UNITTEST
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index ccea4660a1..438a5cce47 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -5,12 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkRefCnt.h"
 #include "SkTSearch.h"
 #include "SkTSort.h"
 #include "SkUtils.h"
+#include "Test.h"
 
 class RefClass : public SkRefCnt {
 public:
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 99e6d11dda..43d17e7cb5 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -13,8 +13,8 @@
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "SkGpuDevice.h"
 #include "GrContextFactory.h"
+#include "SkGpuDevice.h"
 #else
 class GrContext;
 class GrContextFactory;
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index d9f4f9ee4d..fa024baffd 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkRandom.h"
 #include "SkReader32.h"
 #include "SkWriter32.h"
+#include "Test.h"
 
 static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer,
                            const void* expected, size_t size) {
diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 878f40d02b..7ac12fb089 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -5,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
 #include "SkColor.h"
 #include "SkXfermode.h"
+#include "Test.h"
 
 static SkPMColor bogusXfermodeProc(SkPMColor src, SkPMColor dst) {
     return 42;
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index d489972574..fd7f3a356b 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "OverwriteLine.h"
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
@@ -13,7 +14,6 @@
 #include "SkThreadPool.h"
 #include "SkTime.h"
 #include "Test.h"
-#include "OverwriteLine.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"