diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 36dd304c3..40be531d9 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -461,18 +461,9 @@ private:
 
 #include "SkColorPriv.h"
 
-class AutoValidator {
-public:
-    AutoValidator(SkDevice* device) : fDevice(device) {}
-
-private:
-    SkDevice* fDevice;
-};
-
 ////////// macros to place around the internal draw calls //////////////////
 
 #define LOOPER_BEGIN_DRAWDEVICE(paint, type)                        \
-/*    AutoValidator   validator(fMCRec->fTopLayer->fDevice); */     \
     this->predrawNotify();                                          \
     AutoDrawLooper  looper(this, paint, true);                      \
     while (looper.next(type)) {                                     \
@@ -480,7 +471,6 @@ private:
         SkDrawIter          iter(this);
 
 #define LOOPER_BEGIN(paint, type)                                   \
-/*    AutoValidator   validator(fMCRec->fTopLayer->fDevice); */     \
     this->predrawNotify();                                          \
     AutoDrawLooper  looper(this, paint);                            \
     while (looper.next(type)) {                                     \
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index a800fb11d..0d9cf2ba8 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -118,8 +118,8 @@ static void TestGpuBitmapCopy(skiatest::Reporter* reporter, GrContextFactory* fa
             return;
         }
         static const Pair gPairs[] = {
-            { SkBitmap::kNo_Config,         "000"  },
-            { SkBitmap::kARGB_8888_Config,  "011"  },
+            { SkBitmap::kNo_Config,         "00"  },
+            { SkBitmap::kARGB_8888_Config,  "01"  },
         };
 
         const int W = 20;