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>

11 files changed, 11 insertions, 95 deletions

diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index d3916019cf..d458183baa 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -50,7 +50,7 @@ def dm_flags(bot):
     configs.extend(['f16'])
     configs.extend(['sp-8888', '2ndpic-8888'])   # Test niche uses of SkPicture.
     configs.extend(['lite-8888'])                # Experimental display list.
-    configs.extend(['gbr-8888'])
+    configs.extend(['srgbnl'])
 
   if '-TSAN' not in bot:
     if ('TegraK1'  in bot or
@@ -129,10 +129,6 @@ def dm_flags(bot):
   # of 8888.
   blacklist('8888 image _ _')
 
-  # Not any point to running these.
-  blacklist('gbr-8888 image _ _')
-  blacklist('gbr-8888 colorImage _ _')
-
   if 'Valgrind' in bot:
     # These take 18+ hours to run.
     blacklist('pdf gm _ fontmgr_iter')
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 904da2eaa1..a618500c14 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -228,7 +228,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -251,14 +251,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index 1b2eda0049..33f2c83ada 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -118,7 +118,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -141,14 +141,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index f30ab68e2a..ccc6ea30c7 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -118,7 +118,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -141,14 +141,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index bc225af4a3..64a3497596 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -226,7 +226,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -249,14 +249,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
index 62e89a39f1..9a234e4d18 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@@ -228,7 +228,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -251,14 +251,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index 88cb4fc875..71b209897b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -118,7 +118,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -141,14 +141,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
index d84da51608..dea19a0a9b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@@ -226,7 +226,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -249,14 +249,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
index b8f8c0f622..5d166e8bd9 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@@ -266,7 +266,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -289,14 +289,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
index 64cc6a8b81..b55dcd9104 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@@ -232,7 +232,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -255,14 +255,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 2b18bc67f4..4171ec83c5 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -228,7 +228,7 @@
       "sp-8888",
       "2ndpic-8888",
       "lite-8888",
-      "gbr-8888",
+      "srgbnl",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -251,14 +251,6 @@
       "image",
       "_",
       "_",
-      "gbr-8888",
-      "image",
-      "_",
-      "_",
-      "gbr-8888",
-      "colorImage",
-      "_",
-      "_",
       "serialize-8888",
       "gm",
       "_",