Revert of Run dEQP ES3 tests on Windows AMD bots.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index a6ac11c7b5b036ff12381af87890d79709049f8d..ab4687a6e4d0de4e69f1c3756b2c11833d3ae1ff 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -764,12 +764,10 @@
         # added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
-          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
-          # AMD Win 7
           {
             'gpu': '1002:6613',
             'os': 'Windows-2008ServerR2-SP1'
@@ -797,7 +795,6 @@
         # trybots) for the time being, at least until more capacity is added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
-          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'
@@ -825,7 +822,6 @@
         # Run on Nexus 5X swarmed bots.
         'build_configs': ['android-chromium'],
         'swarming_dimension_sets': [
-          # Nexus 5X
           {
             'device_type': 'bullhead',
             'device_os': 'M',
@@ -849,20 +845,15 @@
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on ANGLE roll tryservers.
+        # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
-        # Run only on the NVIDIA and AMD Win7 bots (and trybots) for the time
-        # being, at least until more capacity is added.
+        # Run only on the Win7 Release NVIDIA 32-bit bots (and trybots) for the
+        # time being, at least until more capacity is added.
+        # TODO(jmadill): Run on the Win AMD R7 240 bots once they are swarmed.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
-          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
-            'os': 'Windows-2008ServerR2-SP1'
-          },
-          # AMD Win 7
-          {
-            'gpu': '1002:6613',
             'os': 'Windows-2008ServerR2-SP1'
           }
         ],
@@ -882,13 +873,12 @@
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on ANGLE roll tryservers.
+        # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
         # Run only on the Linux Release NVIDIA 32-bit bots (and trybots) for
         # the time being, at least until more capacity is added.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
-          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'