Add new Intel GPU bot names, remove old AMD.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 224 matching lines @@
           'gpu': '8086:0412',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
+    'Win10 Release (New Intel)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:0412',
+          'os': 'Windows-10-10586',
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'win',
+    },
     'Win7 Debug (New Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0412',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
-    'Win7 Release (AMD R7 240)': {
+    'Win10 Debug (New Intel)': {
       'swarming_dimensions': [
         {
-          'gpu': '1002:6613',
-          'os': 'Windows-2008ServerR2-SP1'
+          'gpu': '8086:0412',
+          'os': 'Windows-10-10586',
         },
       ],
-      'build_config': 'Release',
+      'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
     'Win7 Release (AMD R5 230)': {
       'swarming_dimensions': [
         {
           'gpu': '1002:6779',
           'os': 'Windows-2008ServerR2-SP1'
@@ skipping 1233 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())