Enable GPU Gold pixel tests on remaining bots

Enables the Skia Gold version of the GPU pixel tests on all remaining
bots that are running the non-Gold version. Specifically, enables it on
Linux Debug (NVIDIA)
Mac Release (Intel)
Mac Debug (Intel)
Android Release (Nexus 5X)
Win10 Debug (NVIDIA)
Linux Release Code Coverage (NVIDIA)
Mac Retina Release (AMD)
Linux Release (NVIDIA)
Mac Retina Debug (AMD)
Win10 Release (NVIDIA)

Bug: 850107
Change-Id: I536574c11c3bc6ed32b65737d287864055b0e595
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1691304Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675852}

testing/buildbot/test_suites.pyl

@@ -5117,24 +5117,17 @@
       'gpu_webgl_conformance_telemetry_tests',
     ],
 
-    # TODO(https://crbug.com/850107): Merge this back into
-    # gpu_common_telemetry_tests once Gold is stabilized.
-    'gpu_common_gold_telemetry_tests': [
-      'gpu_common_and_optional_telemetry_tests',
-      'gpu_telemetry_tests',
-      'gpu_telemetry_tests_for_skia_gold_testing',
-      'gpu_webgl_conformance_telemetry_tests',
-    ],
-
     'gpu_common_telemetry_tests': [
       'gpu_common_and_optional_telemetry_tests',
       'gpu_telemetry_tests',
+      'gpu_telemetry_tests_for_skia_gold_testing',
       'gpu_webgl_conformance_telemetry_tests',
     ],
 
     'gpu_common_win_and_linux_telemetry_tests': [
       'gpu_common_and_optional_telemetry_tests',
       'gpu_telemetry_tests',
+      'gpu_telemetry_tests_for_skia_gold_testing',
       'gpu_webgl_conformance_telemetry_tests',
     ],
 

testing/buildbot/waterfalls.pyl

@@ -2374,7 +2374,7 @@
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
           'isolated_scripts': 'gpu_angle_perf_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Android FYI Release (Nexus 5)': {
@@ -2388,7 +2388,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Android FYI Release (Nexus 5X)': {
@@ -2418,7 +2418,7 @@
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
           'isolated_scripts': 'gpu_angle_perf_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Android FYI Release (Nexus 6P)': {
@@ -2433,7 +2433,7 @@
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
           'isolated_scripts': 'gpu_angle_perf_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Android FYI Release (Nexus 9)': {
@@ -2448,7 +2448,7 @@
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
           'isolated_scripts': 'gpu_angle_perf_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Android FYI Release (Pixel 2)': {
@@ -2763,7 +2763,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_mac_debug_gtests',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Mac FYI Experimental Release (Intel)': {
@@ -2846,7 +2846,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_mac_debug_gtests',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Mac FYI Retina Debug (NVIDIA)': {
@@ -2857,7 +2857,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_mac_debug_gtests',
-          'gpu_telemetry_tests': 'gpu_common_gold_telemetry_tests',
+          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
       'Mac FYI Retina Release (AMD)': {