Move all swarming tasks back to old non *.template pools.

All test pools should now have the needed templates.

Bug: 812428
Change-Id: Ia40c73ca7760b7be0aa03e5694e14142e502291b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248880
Reviewed-by: Garrett Beaty <[email protected]>
Commit-Queue: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/master@{#779349}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 20c5f5c..5aa0ced 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1096,7 +1096,7 @@
             {
               'gpu': '10de:1cb3',
               'os': 'Ubuntu',
-              'pool': 'chromium.tests.gpu.template',
+              'pool': 'chromium.tests.gpu',
             },
           ],
         },
@@ -1111,7 +1111,7 @@
             {
               'gpu': '10de:1cb3',
               'os': 'Ubuntu',
-              'pool': 'chromium.tests.gpu.template',
+              'pool': 'chromium.tests.gpu',
             },
           ],
         },
@@ -1126,7 +1126,7 @@
             {
               'gpu': '10de:1cb3',
               'os': 'Ubuntu',
-              'pool': 'chromium.tests.gpu.template',
+              'pool': 'chromium.tests.gpu',
             },
           ],
         },