Target "Windows-10" instead of the specific build number.

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 32929e89feb958bca15366ef1724e12454ba9f03..1aaeb3d1162e23d381f58459d7bbd33941e4d879 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -160,33 +160,11 @@ FYI_WATERFALL = {
       'swarming': True,
       'os_type': 'win',
     },
-    'Win8 Release (NVIDIA)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '10de:104a',
-          'os': 'Windows-10-10586'
-        },
-      ],
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'win',
-    },
-    'Win8 Debug (NVIDIA)': {
-      'swarming_dimensions': [
-        {
-          'gpu': '10de:104a',
-          'os': 'Windows-10-10586'
-        },
-      ],
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'win',
-    },
     'Win10 Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
-          'os': 'Windows-10-10586'
+          'os': 'Windows-10'
         },
       ],
       'build_config': 'Release',
@@ -197,7 +175,7 @@ FYI_WATERFALL = {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
-          'os': 'Windows-10-10586'
+          'os': 'Windows-10'
         },
       ],
       'build_config': 'Debug',
@@ -269,7 +247,7 @@ FYI_WATERFALL = {
       'swarming_dimensions': [
         {
           'gpu': '8086:0412',
-          'os': 'Windows-10-10586',
+          'os': 'Windows-10',
         },
       ],
       'build_config': 'Release',
@@ -295,7 +273,7 @@ FYI_WATERFALL = {
       'swarming_dimensions': [
         {
           'gpu': '8086:0412',
-          'os': 'Windows-10-10586',
+          'os': 'Windows-10',
         },
       ],
       'build_config': 'Debug',