Roll //build, //native_client, and a few more targets of opportunity.

testing/buildbot/chromium.win.json

Index: testing/buildbot/chromium.win.json
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 3f69a8e95a684d0529ba13f71ee2ce9a509f5dce..ca0ab239d759b9ade876a4d8614e4280566a6050 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1,577 +1,1137 @@
 {
-  "XP Tests (1)": {
+  "Vista Tests (1)": {
     "gtest_tests": [
-      "accessibility_unittests",
       {
-        "test": "base_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "accessibility_unittests"
+      },
+      {
+        "test": "app_shell_unittests"
+      },
+      {
+        "test": "aura_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "base_unittests"
       },
-      "app_shell_unittests",
-      "aura_unittests",
       {
-        "test": "browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 10
-        }
+        },
+        "test": "browser_tests"
       },
-      "cacheinvalidation_unittests",
       {
-        "test": "cast_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "cacheinvalidation_unittests"
       },
       {
-        "test": "cc_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cast_unittests"
       },
-      "chromedriver_unittests",
-      "chrome_elf_unittests",
       {
-        "test": "components_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cc_unittests"
+      },
+      {
+        "test": "chrome_elf_unittests"
+      },
+      {
+        "test": "chromedriver_unittests"
       },
       {
-        "test": "components_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "components_unittests"
+      },
+      {
+        "test": "compositor_unittests"
       },
-      "compositor_unittests",
       {
-        "test": "content_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_browsertests"
       },
       {
-        "test": "content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_unittests"
       },
       {
-        "test": "courgette_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "courgette_unittests"
       },
       {
-        "test": "crypto_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "crypto_unittests"
+      },
+      {
+        "test": "events_unittests"
       },
-      "events_unittests",
       {
-        "test": "extensions_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "extensions_browsertests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "test": "gfx_unittests"
+      },
+      {
+        "test": "google_apis_unittests"
       },
-      "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
       {
-        "test": "gpu_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "installer_util_unittests"
       },
-      "installer_util_unittests",
       {
-        "test": "interactive_ui_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 2
-        }
+        },
+        "test": "interactive_ui_tests"
       },
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "jingle_unittests",
       {
-        "test": "media_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "ipc_tests"
       },
-      "nacl_loader_unittests",
       {
-        "test": "net_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "jingle_unittests"
       },
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sbox_unittests",
-      "sbox_integration_tests",
-      "sbox_validation_tests",
-      "sql_unittests",
       {
-        "test": "sync_integration_tests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "media_unittests"
       },
-      "sync_unit_tests",
       {
-        "test": "unit_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "mojo_common_unittests"
       },
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
-      "url_unittests",
-      "views_unittests",
-      "wm_unittests",
-      "skia_unittests"
-    ],
-    "scripts": [
       {
-        "name": "telemetry_unittests",
-        "script": "telemetry_unittests.py"
+        "test": "mojo_public_bindings_unittests"
       },
       {
-        "name": "telemetry_perf_unittests",
-        "script": "telemetry_perf_unittests.py"
+        "test": "mojo_public_environment_unittests"
       },
       {
-        "name": "nacl_integration",
-        "script": "nacl_integration.py"
-      }
-    ]
-  },
-  "Vista Tests (1)": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "app_shell_unittests",
-      "aura_unittests",
+        "test": "mojo_public_system_unittests"
+      },
       {
-        "test": "base_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "mojo_public_utility_unittests"
       },
       {
-        "test": "browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 10
-        }
+        "test": "mojo_system_unittests"
       },
-      "cacheinvalidation_unittests",
       {
-        "test": "cast_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "nacl_loader_unittests"
       },
       {
-        "test": "cc_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "net_unittests"
       },
-      "chromedriver_unittests",
-      "chrome_elf_unittests",
       {
-        "test": "components_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "ppapi_unittests"
       },
-      "compositor_unittests",
       {
-        "test": "content_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "printing_unittests"
       },
       {
-        "test": "content_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "remoting_unittests"
       },
       {
-        "test": "courgette_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "sbox_integration_tests"
       },
       {
-        "test": "crypto_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "sbox_unittests"
       },
       {
-        "test": "extensions_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "sbox_validation_tests"
       },
-      "extensions_unittests",
-      "events_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
       {
-        "test": "gpu_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "skia_unittests"
       },
-      "installer_util_unittests",
       {
-        "test": "interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 2
-        }
+        "test": "sql_unittests"
       },
-      "ipc_tests",
-      "jingle_unittests",
       {
-        "test": "media_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "sync_integration_tests"
       },
-      "mojo_common_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_system_unittests",
-      "nacl_loader_unittests",
       {
-        "test": "net_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "sync_unit_tests"
       },
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sbox_unittests",
-      "sbox_integration_tests",
-      "sbox_validation_tests",
-      "sql_unittests",
       {
-        "test": "sync_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
       },
-      "sync_unit_tests",
       {
-        "test": "unit_tests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "unit_tests"
       },
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
-      "url_unittests",
-      "views_unittests",
-      "wm_unittests",
-      "skia_unittests"
-    ],
-    "scripts": [
       {
-        "name": "telemetry_unittests",
-        "script": "telemetry_unittests.py"
+        "test": "url_unittests"
       },
       {
-        "name": "telemetry_perf_unittests",
-        "script": "telemetry_perf_unittests.py"
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
       }
-    ]
+    ],
+    "scripts": []
   },
-  "Win7 Tests (1)": {
+  "Win 7 Tests x64 (1)": {
     "gtest_tests": [
-      "app_installer_unittests",
-      "app_list_unittests",
-      "accessibility_unittests",
       {
-        "test": "ash_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "accessibility_unittests"
+      },
+      {
+        "test": "app_installer_unittests"
       },
-      "app_shell_unittests",
-      "aura_unittests",
       {
-        "test": "base_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "app_list_unittests"
       },
       {
-        "test": "browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 10
-        }
+        "test": "app_shell_unittests"
       },
-      "cacheinvalidation_unittests",
       {
-        "test": "cast_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "ash_unittests"
       },
       {
-        "test": "cc_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "aura_unittests"
       },
-      "chromedriver_unittests",
-      "chrome_elf_unittests",
-      "components_browsertests",
       {
-        "test": "components_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "base_unittests"
       },
-      "compositor_unittests",
       {
-        "test": "content_browsertests",
         "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+          "can_use_on_swarming_builders": true,
+          "shards": 10
+        },
+        "test": "browser_tests"
       },
       {
-        "test": "content_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "cacheinvalidation_unittests"
       },
       {
-        "test": "courgette_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cast_unittests"
       },
       {
-        "test": "crypto_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cc_unittests"
       },
-      "device_unittests",
-      "events_unittests",
       {
-        "test": "extensions_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "chrome_elf_unittests"
+      },
+      {
+        "test": "chromedriver_unittests"
+      },
+      {
+        "test": "components_browsertests"
       },
-      "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
       {
-        "test": "gpu_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "components_unittests"
       },
-      "installer_util_unittests",
       {
-        "test": "interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 2
-        }
+        "test": "compositor_unittests"
       },
-      "ipc_tests",
-      "jingle_unittests",
-      "keyboard_unittests",
       {
-        "test": "media_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_browsertests"
       },
-      "message_center_unittests",
-      "mojo_common_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_system_unittests",
-      "nacl_loader_unittests",
       {
-        "test": "net_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_unittests"
       },
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sbox_unittests",
-      "sbox_integration_tests",
-      "sbox_validation_tests",
-      "sql_unittests",
       {
-        "test": "sync_integration_tests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "courgette_unittests"
       },
-      "sync_unit_tests",
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
       {
-        "test": "unit_tests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "crypto_unittests"
       },
-      "url_unittests",
-      "views_unittests",
-      "wm_unittests",
-      "skia_unittests"
-    ],
-    "scripts": [
       {
-        "name": "telemetry_unittests",
-        "script": "telemetry_unittests.py"
+        "test": "device_unittests"
       },
       {
-        "name": "telemetry_perf_unittests",
-        "script": "telemetry_perf_unittests.py"
+        "test": "events_unittests"
       },
       {
-        "name": "nacl_integration",
-        "script": "nacl_integration.py"
-      }
-    ]
-  },
-  "Win 7 Tests x64 (1)": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      {
-        "test": "base_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "extensions_browsertests"
       },
       {
-        "test": "browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 10
-        }
+        "test": "extensions_unittests"
       },
-      "app_installer_unittests",
-      "app_list_unittests",
-      "app_shell_unittests",
       {
-        "test": "ash_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "gcm_unit_tests"
       },
-      "aura_unittests",
-      "cacheinvalidation_unittests",
       {
-        "test": "cast_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "gfx_unittests"
       },
       {
-        "test": "cc_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "google_apis_unittests"
       },
-      "chromedriver_unittests",
-      "chrome_elf_unittests",
-      "components_browsertests",
       {
-        "test": "components_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "gpu_unittests"
       },
-      "compositor_unittests",
       {
-        "test": "content_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "installer_util_unittests"
       },
       {
-        "test": "content_unittests",
         "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+          "can_use_on_swarming_builders": true,
+          "shards": 2
+        },
+        "test": "interactive_ui_tests"
       },
       {
-        "test": "courgette_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "ipc_tests"
       },
       {
-        "test": "crypto_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "jingle_unittests"
       },
-      "device_unittests",
-      "events_unittests",
       {
-        "test": "extensions_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
+        "test": "keyboard_unittests"
       },
-      "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
       {
-        "test": "gpu_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "media_unittests"
       },
-      "installer_util_unittests",
       {
-        "test": "interactive_ui_tests",
-        "swarming": {
+        "test": "message_center_unittests"
+      },
+      {
+        "test": "mojo_common_unittests"
+      },
+      {
+        "test": "mojo_public_bindings_unittests"
+      },
+      {
+        "test": "mojo_public_environment_unittests"
+      },
+      {
+        "test": "mojo_public_system_unittests"
+      },
+      {
+        "test": "mojo_public_utility_unittests"
+      },
+      {
+        "test": "mojo_system_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "net_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sbox_integration_tests"
+      },
+      {
+        "test": "sbox_unittests"
+      },
+      {
+        "test": "sbox_validation_tests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "sync_integration_tests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "unit_tests"
+      },
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
+      }
+    ],
+    "scripts": [
+      {
+        "name": "telemetry_unittests",
+        "script": "telemetry_unittests.py"
+      },
+      {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
+        "name": "nacl_integration",
+        "script": "nacl_integration.py"
+      }
+    ]
+  },
+  "Win x64 GN": {
+    "additional_compile_targets": [
+      "accessibility_unittests",
+      "app_list_unittests",
+      "app_shell_unittests",
+      "ash_unittests",
+      "aura_unittests",
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chrome",
+      "chrome_elf_unittests",
+      "chromedriver_unittests",
+      "components_browsertests",
+      "components_unittests",
+      "compositor_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "courgette_unittests",
+      "crypto_unittests",
+      "device_unittests",
+      "events_unittests",
+      "extensions_browsertests",
+      "extensions_unittests",
+      "gcm_unit_tests",
+      "gfx_unittests",
+      "google_apis_unittests",
+      "gpu_unittests",
+      "interactive_ui_tests",
+      "ipc_mojo_unittests",
+      "ipc_tests",
+      "jingle_unittests",
+      "keyboard_unittests",
+      "media_unittests",
+      "message_center_unittests",
+      "mojo_common_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_system_unittests",
+      "ppapi_unittests",
+      "printing_unittests",
+      "sbox_integration_tests",
+      "sbox_unittests",
+      "sbox_validation_tests",
+      "skia_unittests",
+      "sql_unittests",
+      "sync_integration_tests",
+      "sync_unit_tests",
+      "ui_base_unittests",
+      "ui_touch_selection_unittests",
+      "url_unittests",
+      "views_unittests",
+      "wm_unittests"
+    ],
+    "gtest_tests": [
+      {
+        "test": "base_unittests"
+      }
+    ]
+  },
+  "Win x64 GN (dbg)": {
+    "additional_compile_targets": [
+      "accessibility_unittests",
+      "app_list_unittests",
+      "app_shell_unittests",
+      "ash_unittests",
+      "aura_unittests",
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chrome",
+      "chrome_elf_unittests",
+      "chromedriver_unittests",
+      "components_browsertests",
+      "components_unittests",
+      "compositor_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "courgette_unittests",
+      "crypto_unittests",
+      "device_unittests",
+      "events_unittests",
+      "extensions_browsertests",
+      "extensions_unittests",
+      "gcm_unit_tests",
+      "gfx_unittests",
+      "google_apis_unittests",
+      "gpu_unittests",
+      "interactive_ui_tests",
+      "ipc_mojo_unittests",
+      "ipc_tests",
+      "jingle_unittests",
+      "keyboard_unittests",
+      "media_unittests",
+      "message_center_unittests",
+      "mojo_common_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_system_unittests",
+      "ppapi_unittests",
+      "printing_unittests",
+      "sbox_integration_tests",
+      "sbox_unittests",
+      "sbox_validation_tests",
+      "skia_unittests",
+      "sql_unittests",
+      "sync_integration_tests",
+      "sync_unit_tests",
+      "ui_base_unittests",
+      "ui_touch_selection_unittests",
+      "url_unittests",
+      "views_unittests",
+      "wm_unittests"
+    ],
+    "gtest_tests": [
+      {
+        "test": "base_unittests"
+      }
+    ]
+  },
+  "Win7 Tests (1)": {
+    "gtest_tests": [
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "accessibility_unittests"
+      },
+      {
+        "test": "app_installer_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "app_list_unittests"
+      },
+      {
+        "test": "app_shell_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
+      {
+        "test": "aura_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 10
+        },
+        "test": "browser_tests"
+      },
+      {
+        "test": "cacheinvalidation_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "cast_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "cc_unittests"
+      },
+      {
+        "test": "chrome_elf_unittests"
+      },
+      {
+        "test": "chromedriver_unittests"
+      },
+      {
+        "test": "components_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_unittests"
+      },
+      {
+        "test": "compositor_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "courgette_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "crypto_unittests"
+      },
+      {
+        "test": "device_unittests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "test": "gfx_unittests"
+      },
+      {
+        "test": "google_apis_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "installer_util_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 2
+        },
+        "test": "interactive_ui_tests"
+      },
+      {
+        "test": "ipc_tests"
+      },
+      {
+        "test": "jingle_unittests"
+      },
+      {
+        "test": "keyboard_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "media_unittests"
+      },
+      {
+        "test": "message_center_unittests"
+      },
+      {
+        "test": "mojo_common_unittests"
+      },
+      {
+        "test": "mojo_public_bindings_unittests"
+      },
+      {
+        "test": "mojo_public_environment_unittests"
+      },
+      {
+        "test": "mojo_public_system_unittests"
+      },
+      {
+        "test": "mojo_public_utility_unittests"
+      },
+      {
+        "test": "mojo_system_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "net_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sbox_integration_tests"
+      },
+      {
+        "test": "sbox_unittests"
+      },
+      {
+        "test": "sbox_validation_tests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "sync_integration_tests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "unit_tests"
+      },
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
+      }
+    ],
+    "scripts": [
+      {
+        "name": "telemetry_unittests",
+        "script": "telemetry_unittests.py"
+      },
+      {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      },
+      {
+        "name": "nacl_integration",
+        "script": "nacl_integration.py"
+      }
+    ]
+  },
+  "Win7 Tests (dbg)(1)": {
+    "gtest_tests": [
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "accessibility_unittests"
+      },
+      {
+        "test": "app_shell_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
+      {
+        "test": "aura_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 20
+        },
+        "test": "browser_tests"
+      },
+      {
+        "test": "cacheinvalidation_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "cast_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "cc_unittests"
+      },
+      {
+        "test": "chrome_elf_unittests"
+      },
+      {
+        "test": "chromedriver_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_unittests"
+      },
+      {
+        "test": "compositor_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 2
+        },
+        "test": "content_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "courgette_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "crypto_unittests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "installer_util_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 4
+        },
+        "test": "interactive_ui_tests"
+      },
+      {
+        "test": "ipc_tests"
+      },
+      {
+        "test": "jingle_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "media_unittests"
+      },
+      {
+        "test": "mojo_common_unittests"
+      },
+      {
+        "test": "mojo_public_bindings_unittests"
+      },
+      {
+        "test": "mojo_public_environment_unittests"
+      },
+      {
+        "test": "mojo_public_system_unittests"
+      },
+      {
+        "test": "mojo_public_utility_unittests"
+      },
+      {
+        "test": "mojo_system_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "net_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sbox_integration_tests"
+      },
+      {
+        "test": "sbox_unittests"
+      },
+      {
+        "test": "sbox_validation_tests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
+      },
+      {
+        "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 2
-        }
+        },
+        "test": "sync_integration_tests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
       },
-      "ipc_tests",
-      "jingle_unittests",
-      "keyboard_unittests",
       {
-        "test": "media_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "unit_tests"
+      },
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
+      }
+    ],
+    "scripts": [
+      {
+        "name": "telemetry_unittests",
+        "script": "telemetry_unittests.py"
+      },
+      {
+        "name": "telemetry_perf_unittests",
+        "script": "telemetry_perf_unittests.py"
+      }
+    ]
+  },
+  "Win8 Aura": {
+    "gtest_tests": [
+      {
+        "test": "ash_unittests"
+      },
+      {
+        "test": "aura_unittests"
+      },
+      {
+        "test": "compositor_unittests"
+      },
+      {
+        "test": "content_browsertests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
+      },
+      {
+        "test": "views_unittests"
       },
+      {
+        "test": "wm_unittests"
+      }
+    ]
+  },
+  "Win8 GN": {
+    "additional_compile_targets": [
+      "accessibility_unittests",
+      "app_list_unittests",
+      "app_shell_unittests",
+      "ash_unittests",
+      "aura_unittests",
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chrome",
+      "chrome_elf_unittests",
+      "chromedriver_unittests",
+      "components_browsertests",
+      "components_unittests",
+      "compositor_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "courgette_unittests",
+      "crypto_unittests",
+      "device_unittests",
+      "events_unittests",
+      "extensions_browsertests",
+      "extensions_unittests",
+      "gcm_unit_tests",
+      "gfx_unittests",
+      "google_apis_unittests",
+      "gpu_unittests",
+      "interactive_ui_tests",
+      "ipc_mojo_unittests",
+      "ipc_tests",
+      "jingle_unittests",
+      "keyboard_unittests",
+      "media_unittests",
       "message_center_unittests",
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
@@ -579,197 +1139,291 @@
       "mojo_public_system_unittests",
       "mojo_public_utility_unittests",
       "mojo_system_unittests",
-      "nacl_loader_unittests",
-      {
-        "test": "net_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
       "ppapi_unittests",
       "printing_unittests",
-      "remoting_unittests",
-      "sbox_unittests",
       "sbox_integration_tests",
+      "sbox_unittests",
       "sbox_validation_tests",
-      {
-        "test": "sync_integration_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "skia_unittests",
       "sql_unittests",
+      "sync_integration_tests",
       "sync_unit_tests",
       "ui_base_unittests",
       "ui_touch_selection_unittests",
-      {
-        "test": "unit_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
       "url_unittests",
       "views_unittests",
-      "wm_unittests",
-      "skia_unittests"
+      "wm_unittests"
     ],
-    "scripts": [
-      {
-        "name": "telemetry_unittests",
-        "script": "telemetry_unittests.py"
-      },
+    "gtest_tests": [
       {
-        "name": "telemetry_perf_unittests",
-        "script": "telemetry_perf_unittests.py"
-      },
+        "test": "base_unittests"
+      }
+    ]
+  },
+  "Win8 GN (dbg)": {
+    "additional_compile_targets": [
+      "accessibility_unittests",
+      "app_list_unittests",
+      "app_shell_unittests",
+      "ash_unittests",
+      "aura_unittests",
+      "cacheinvalidation_unittests",
+      "cast_unittests",
+      "cc_unittests",
+      "chrome",
+      "chrome_elf_unittests",
+      "chromedriver_unittests",
+      "components_browsertests",
+      "components_unittests",
+      "compositor_unittests",
+      "content_browsertests",
+      "content_unittests",
+      "courgette_unittests",
+      "crypto_unittests",
+      "device_unittests",
+      "events_unittests",
+      "extensions_browsertests",
+      "extensions_unittests",
+      "gcm_unit_tests",
+      "gfx_unittests",
+      "google_apis_unittests",
+      "gpu_unittests",
+      "interactive_ui_tests",
+      "ipc_mojo_unittests",
+      "ipc_tests",
+      "jingle_unittests",
+      "keyboard_unittests",
+      "media_unittests",
+      "message_center_unittests",
+      "mojo_common_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_system_unittests",
+      "ppapi_unittests",
+      "printing_unittests",
+      "sbox_integration_tests",
+      "sbox_unittests",
+      "sbox_validation_tests",
+      "skia_unittests",
+      "sql_unittests",
+      "sync_integration_tests",
+      "sync_unit_tests",
+      "ui_base_unittests",
+      "ui_touch_selection_unittests",
+      "url_unittests",
+      "views_unittests",
+      "wm_unittests"
+    ],
+    "gtest_tests": [
       {
-        "name": "nacl_integration",
-        "script": "nacl_integration.py"
+        "test": "base_unittests"
       }
     ]
   },
-  "Win7 Tests (dbg)(1)": {
+  "XP Tests (1)": {
     "gtest_tests": [
-      "accessibility_unittests",
       {
-        "test": "ash_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "accessibility_unittests"
+      },
+      {
+        "test": "app_shell_unittests"
+      },
+      {
+        "test": "aura_unittests"
       },
-      "app_shell_unittests",
-      "aura_unittests",
       {
-        "test": "base_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "base_unittests"
       },
       {
-        "test": "browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 20
-        }
+          "shards": 10
+        },
+        "test": "browser_tests"
+      },
+      {
+        "test": "cacheinvalidation_unittests"
       },
-      "cacheinvalidation_unittests",
       {
-        "test": "cast_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cast_unittests"
       },
       {
-        "test": "cc_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "cc_unittests"
+      },
+      {
+        "test": "chrome_elf_unittests"
+      },
+      {
+        "test": "chromedriver_unittests"
       },
-      "chromedriver_unittests",
-      "chrome_elf_unittests",
       {
-        "test": "components_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "components_browsertests"
       },
-      "compositor_unittests",
       {
-        "test": "content_browsertests",
         "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 2
-        }
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_unittests"
+      },
+      {
+        "test": "compositor_unittests"
       },
       {
-        "test": "content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_browsertests"
       },
       {
-        "test": "courgette_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "content_unittests"
       },
       {
-        "test": "crypto_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "courgette_unittests"
       },
-      "events_unittests",
       {
-        "test": "extensions_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "crypto_unittests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "extensions_browsertests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "test": "gfx_unittests"
+      },
+      {
+        "test": "google_apis_unittests"
       },
-      "extensions_unittests",
-      "gcm_unit_tests",
       {
-        "test": "gpu_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "installer_util_unittests"
       },
-      "installer_util_unittests",
       {
-        "test": "interactive_ui_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 4
-        }
+          "shards": 2
+        },
+        "test": "interactive_ui_tests"
+      },
+      {
+        "test": "ipc_mojo_unittests"
+      },
+      {
+        "test": "ipc_tests"
+      },
+      {
+        "test": "jingle_unittests"
       },
-      "ipc_tests",
-      "jingle_unittests",
       {
-        "test": "media_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "media_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
       },
-      "mojo_common_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_system_unittests",
-      "nacl_loader_unittests",
       {
-        "test": "net_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "net_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sbox_integration_tests"
+      },
+      {
+        "test": "sbox_unittests"
+      },
+      {
+        "test": "sbox_validation_tests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
       },
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sbox_unittests",
-      "sbox_integration_tests",
-      "sbox_validation_tests",
-      "sql_unittests",
       {
-        "test": "sync_integration_tests",
         "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 2
-        }
+          "can_use_on_swarming_builders": true
+        },
+        "test": "sync_integration_tests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
       },
-      "sync_unit_tests",
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
       {
-        "test": "unit_tests",
         "swarming": {
           "can_use_on_swarming_builders": true
-        }
+        },
+        "test": "unit_tests"
       },
-      "url_unittests",
-      "views_unittests",
-      "wm_unittests",
-      "skia_unittests"
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
+      }
     ],
     "scripts": [
       {
@@ -779,19 +1433,11 @@
       {
         "name": "telemetry_perf_unittests",
         "script": "telemetry_perf_unittests.py"
+      },
+      {
+        "name": "nacl_integration",
+        "script": "nacl_integration.py"
       }
     ]
-  },
-  "Win8 Aura": {
-    "gtest_tests": [
-      "views_unittests",
-      "wm_unittests",
-      "aura_unittests",
-      "ash_unittests",
-      "compositor_unittests",
-      "content_browsertests",
-      "events_unittests",
-      "ui_touch_selection_unittests"
-    ]
   }
 }