Revert "Add color spin test for SkColorSpaceXformCanvas"

This reverts commit cb01aec63bcb3dee52afcf3605bcd64166b873c0.

Reason for revert: Breaks Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE

Original change's description:
> Add color spin test for SkColorSpaceXformCanvas
> 
> Also changes behavior to treat nullptr srcs as sRGB.
> 
> Testing locally, it looks like 353 gms have no diffs from 8888.
> There are 269 diffs - some are fine (gms that do color space stuff)
> and some are bugs.
> 
> BUG=skia:
> 
> Change-Id: I55c2825f4f4b857e0b0a0ec050c6db82ac881492
> Reviewed-on: https://skia-review.googlesource.com/9738
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
> 

TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reviews@skia.org
# Not skipping CQ checks because original CL landed > 1 day ago.
BUG=skia:

Change-Id: I70bb69f747b863d267494e37a60888a51ab0184c
Reviewed-on: https://skia-review.googlesource.com/9823
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp
index 2d0d12038c..80282787da 100644
--- a/gm/imagemasksubset.cpp
+++ b/gm/imagemasksubset.cpp
@@ -34,12 +34,7 @@ public:
             return false;
         }
 
-        SkImageInfo surfaceInfo = info;
-        if (kAlpha_8_SkColorType == info.colorType()) {
-            surfaceInfo = surfaceInfo.makeColorSpace(nullptr);
-        }
-
-        make_mask(SkSurface::MakeRasterDirect(surfaceInfo, pixels, rowBytes));
+        make_mask(SkSurface::MakeRasterDirect(info, pixels, rowBytes));
         return true;
     }