remove obsolete DM test configs

ViaSingletonPictures simulates a load pattern that Blink no longer produces.

I don't even remember what Via2ndPic and ViaTwice are meant to test,
but I imagine they're quite obsolete.

There was a lingering reference to ViaMojo, which otherwise doesn't exist.

Bug: skia:7544

Change-Id: I033fd344314054ad66c363e5dbd0a373be188069
Reviewed-on: https://skia-review.googlesource.com/88780
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

10 files changed, 0 insertions, 529 deletions

diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
index 345527cdad..105dad7829 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
@@ -168,8 +168,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -346,74 +344,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -422,18 +384,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -442,18 +396,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -462,10 +408,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
index 6f673f1abe..9d472b5dd7 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
@@ -167,8 +167,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -340,74 +338,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -416,18 +378,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -436,18 +390,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -456,10 +402,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 8410e0e313..f57e7135df 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -239,8 +239,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -412,74 +410,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -488,18 +450,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -508,18 +462,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -528,10 +474,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
index bce495b933..5a23ad7fab 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
@@ -173,8 +173,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -346,74 +344,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -422,18 +384,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -442,18 +396,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -462,10 +408,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
index ca76df809a..20dd305575 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
@@ -168,8 +168,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -341,74 +339,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -417,18 +379,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -437,18 +391,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -457,10 +403,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
index 69191ba1b5..463d8f80db 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
@@ -237,8 +237,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -410,74 +408,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -486,18 +448,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -506,18 +460,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -526,10 +472,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
index 360a9a297d..77622bd8e1 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
@@ -235,8 +235,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -408,74 +406,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -484,18 +446,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -504,18 +458,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -524,10 +470,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index a1c44c9c87..c4ccceb311 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -235,8 +235,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -408,74 +406,38 @@
       "gm",
       "_",
       "bleed_alpha_image_shader",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -484,18 +446,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -504,18 +458,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -524,10 +470,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index 0b190277d9..080fe1c2b0 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -236,8 +236,6 @@
       "g8",
       "565",
       "f16",
-      "sp-8888",
-      "2ndpic-8888",
       "lite-8888",
       "gbr-8888",
       "serialize-8888",
@@ -469,74 +467,38 @@
       "gm",
       "_",
       "verylarge_picture_image",
-      "sp-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "pic-8888",
       "gm",
       "_",
       "drawfilter",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "drawfilter",
       "lite-8888",
       "gm",
       "_",
       "drawfilter",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-picture",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-picture",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-raster",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-raster",
-      "sp-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "pic-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "image-cacherator-from-ctable",
       "serialize-8888",
       "gm",
       "_",
       "image-cacherator-from-ctable",
-      "sp-8888",
-      "gm",
-      "_",
-      "gamut",
       "pic-8888",
       "gm",
       "_",
@@ -545,18 +507,10 @@
       "gm",
       "_",
       "gamut",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "gamut",
       "serialize-8888",
       "gm",
       "_",
       "gamut",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "pic-8888",
       "gm",
       "_",
@@ -565,18 +519,10 @@
       "gm",
       "_",
       "complexclip4_bw",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_bw",
       "serialize-8888",
       "gm",
       "_",
       "complexclip4_bw",
-      "sp-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "pic-8888",
       "gm",
       "_",
@@ -585,10 +531,6 @@
       "gm",
       "_",
       "complexclip4_aa",
-      "2ndpic-8888",
-      "gm",
-      "_",
-      "complexclip4_aa",
       "serialize-8888",
       "gm",
       "_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 3e8dcdb933..76f50a69f9 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -98,7 +98,6 @@ def dm_flags(api, bot):
       configs.extend(['g8'])
       configs.extend(['565'])
       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'])
 
@@ -435,25 +434,19 @@ def dm_flags(api, bot):
 
   # skia:4769
   for test in ['drawfilter']:
-    blacklist([    'sp-8888', 'gm', '_', test])
     blacklist([   'pic-8888', 'gm', '_', test])
-    blacklist(['2ndpic-8888', 'gm', '_', test])
     blacklist([  'lite-8888', 'gm', '_', test])
   # skia:4703
   for test in ['image-cacherator-from-picture',
                'image-cacherator-from-raster',
                'image-cacherator-from-ctable']:
-    blacklist([       'sp-8888', 'gm', '_', test])
     blacklist([      'pic-8888', 'gm', '_', test])
-    blacklist([   '2ndpic-8888', 'gm', '_', test])
     blacklist(['serialize-8888', 'gm', '_', test])
 
   # GM that requires raster-backed canvas
   for test in ['gamut', 'complexclip4_bw', 'complexclip4_aa']:
-    blacklist([       'sp-8888', 'gm', '_', test])
     blacklist([      'pic-8888', 'gm', '_', test])
     blacklist([     'lite-8888', 'gm', '_', test])
-    blacklist([   '2ndpic-8888', 'gm', '_', test])
     blacklist(['serialize-8888', 'gm', '_', test])
 
   # GM that not support tiles_rt