Re-land dEQP ES3 tests on Windows ANGLE 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 1ae945bece0cb4bdc3ede97296a9101433056747..e91fd7d4c4de57d8b9738e1475660cc4c904650c 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -765,10 +765,12 @@ COMMON_GTESTS = {
         # 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'
@@ -796,6 +798,7 @@ COMMON_GTESTS = {
         # 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'
@@ -823,6 +826,7 @@ COMMON_GTESTS = {
         # Run on Nexus 5X swarmed bots.
         'build_configs': ['android-chromium'],
         'swarming_dimension_sets': [
+          # Nexus 5X
           {
             'device_type': 'bullhead',
             'device_os': 'M',
@@ -846,16 +850,21 @@ COMMON_GTESTS = {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on the optional tryservers.
+        # TODO(jmadill): Run this on ANGLE roll tryservers.
         'run_on_optional': False,
-        # 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.
+        # Run only on the NVIDIA and AMD Win7 bots (and trybots) for the time
+        # being, at least until more capacity is added.
         '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'
           }
         ],
       }
@@ -874,12 +883,13 @@ COMMON_GTESTS = {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on the optional tryservers.
+        # TODO(jmadill): Run this on ANGLE roll 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'