| Index: testing/buildbot/chromium.linux.json
 | 
| diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
 | 
| index 48ed3244c5fcb6756446602aa6f3e282d3019624..88acb35a964a7a85da662dee66f51f6c99546bf8 100644
 | 
| --- a/testing/buildbot/chromium.linux.json
 | 
| +++ b/testing/buildbot/chromium.linux.json
 | 
| @@ -1,170 +1,461 @@
 | 
|  {
 | 
| +  "Android GN": {
 | 
| +    "additional_compile_targets": [
 | 
| +      "chrome_shell_apk"
 | 
| +    ],
 | 
| +    "gtest_tests": []
 | 
| +  },
 | 
| +  "Android Tests": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "name": "webview_licenses",
 | 
| +        "script": "webview_licenses.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Android Tests (dbg)": {
 | 
| +    "scripts": [
 | 
| +      {
 | 
| +        "name": "webview_licenses",
 | 
| +        "script": "webview_licenses.py"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Linux Clang (dbg)": {
 | 
| +    "gtest_tests": [
 | 
| +      {
 | 
| +        "swarming": {
 | 
| +          "can_use_on_swarming_builders": true
 | 
| +        },
 | 
| +        "test": "accessibility_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "app_shell_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "base_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "components_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "content_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "crypto_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "device_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "display_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "extensions_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gn_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "google_apis_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_mojo_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "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"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sandbox_linux_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "skia_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sql_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sync_unit_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ui_base_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "unit_tests"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Linux GN": {
 | 
| +    "additional_compile_targets": [
 | 
| +      "accessibility_unittests",
 | 
| +      "app_list_unittests",
 | 
| +      "aura_unittests",
 | 
| +      "browser_tests",
 | 
| +      "cacheinvalidation_unittests",
 | 
| +      "cast_unittests",
 | 
| +      "cc_unittests",
 | 
| +      "chromedriver_unittests",
 | 
| +      "components_browsertests",
 | 
| +      "components_unittests",
 | 
| +      "content_browsertests",
 | 
| +      "content_unittests",
 | 
| +      "crypto_unittests",
 | 
| +      "dbus_unittests",
 | 
| +      "device_unittests",
 | 
| +      "display_unittests",
 | 
| +      "events_unittests",
 | 
| +      "extensions_browsertests",
 | 
| +      "extensions_unittests",
 | 
| +      "gcm_unit_tests",
 | 
| +      "gfx_unittests",
 | 
| +      "gn_unittests",
 | 
| +      "google_apis_unittests",
 | 
| +      "gpu_unittests",
 | 
| +      "interactive_ui_tests",
 | 
| +      "ipc_mojo_unittests",
 | 
| +      "ipc_tests",
 | 
| +      "jingle_unittests",
 | 
| +      "media_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",
 | 
| +      "net_unittests",
 | 
| +      "ppapi_unittests",
 | 
| +      "printing_unittests",
 | 
| +      "remoting_unittests",
 | 
| +      "sandbox_linux_unittests",
 | 
| +      "skia_unittests",
 | 
| +      "sql_unittests",
 | 
| +      "sync_integration_tests",
 | 
| +      "sync_unit_tests",
 | 
| +      "ui_base_unittests",
 | 
| +      "ui_touch_selection_unittests",
 | 
| +      "unit_tests",
 | 
| +      "url_unittests",
 | 
| +      "views_unittests",
 | 
| +      "wm_unittests"
 | 
| +    ],
 | 
| +    "gtest_tests": [
 | 
| +      {
 | 
| +        "test": "base_unittests"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
| +  "Linux GN (dbg)": {
 | 
| +    "additional_compile_targets": [
 | 
| +      "accessibility_unittests",
 | 
| +      "app_list_unittests",
 | 
| +      "aura_unittests",
 | 
| +      "browser_tests",
 | 
| +      "cacheinvalidation_unittests",
 | 
| +      "cast_unittests",
 | 
| +      "cc_unittests",
 | 
| +      "chromedriver_unittests",
 | 
| +      "components_browsertests",
 | 
| +      "components_unittests",
 | 
| +      "content_browsertests",
 | 
| +      "content_unittests",
 | 
| +      "crypto_unittests",
 | 
| +      "dbus_unittests",
 | 
| +      "device_unittests",
 | 
| +      "display_unittests",
 | 
| +      "events_unittests",
 | 
| +      "extensions_browsertests",
 | 
| +      "extensions_unittests",
 | 
| +      "gcm_unit_tests",
 | 
| +      "gfx_unittests",
 | 
| +      "gn_unittests",
 | 
| +      "google_apis_unittests",
 | 
| +      "gpu_unittests",
 | 
| +      "interactive_ui_tests",
 | 
| +      "ipc_mojo_unittests",
 | 
| +      "ipc_tests",
 | 
| +      "jingle_unittests",
 | 
| +      "media_unittests",
 | 
| +      "mojo_common_unittests",
 | 
| +      "mojo_public_bindings_unittests",
 | 
| +      "mojo_public_environment_unittests",
 | 
| +      "mojo_public_system_unittests",
 | 
| +      "mojo_public_utility_unittests",
 | 
| +      "mojo_system_unittests",
 | 
| +      "net_unittests",
 | 
| +      "ppapi_unittests",
 | 
| +      "printing_unittests",
 | 
| +      "remoting_unittests",
 | 
| +      "sandbox_linux_unittests",
 | 
| +      "skia_unittests",
 | 
| +      "sql_unittests",
 | 
| +      "sync_integration_tests",
 | 
| +      "sync_unit_tests",
 | 
| +      "ui_base_unittests",
 | 
| +      "ui_touch_selection_unittests",
 | 
| +      "unit_tests",
 | 
| +      "url_unittests",
 | 
| +      "views_unittests",
 | 
| +      "wm_unittests"
 | 
| +    ],
 | 
| +    "gtest_tests": [
 | 
| +      {
 | 
| +        "test": "base_unittests"
 | 
| +      }
 | 
| +    ]
 | 
| +  },
 | 
|    "Linux Tests": {
 | 
|      "gtest_tests": [
 | 
|        {
 | 
| -        "test": "accessibility_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "accessibility_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "app_list_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "app_list_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": 5
 | 
| -        }
 | 
| +        },
 | 
| +        "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": "chromedriver_unittests"
 | 
|        },
 | 
| -      "chromedriver_unittests",
 | 
|        {
 | 
| -        "test": "components_browsertests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "components_browsertests"
 | 
|        },
 | 
|        {
 | 
| -        "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": "crypto_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "crypto_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "dbus_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "device_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "display_unittests"
 | 
|        },
 | 
| -      "dbus_unittests",
 | 
| -      "device_unittests",
 | 
| -      "display_unittests",
 | 
|        {
 | 
| -        "test": "events_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "events_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "extensions_browsertests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "extensions_browsertests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "extensions_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gcm_unit_tests"
 | 
|        },
 | 
| -      "extensions_unittests",
 | 
| -      "gcm_unit_tests",
 | 
|        {
 | 
| -        "test": "gfx_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gfx_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gn_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "google_apis_unittests"
 | 
|        },
 | 
| -      "google_apis_unittests",
 | 
|        {
 | 
| -        "test": "gpu_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gpu_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "interactive_ui_tests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "interactive_ui_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_mojo_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "jingle_unittests"
 | 
|        },
 | 
| -      "ipc_mojo_unittests",
 | 
| -      "ipc_tests",
 | 
| -      "jingle_unittests",
 | 
|        {
 | 
| -        "test": "media_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"
 | 
|        },
 | 
| -      "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": "sandbox_linux_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "skia_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sql_unittests"
 | 
|        },
 | 
| -      "ppapi_unittests",
 | 
| -      "printing_unittests",
 | 
| -      "remoting_unittests",
 | 
| -      "sandbox_linux_unittests",
 | 
| -      "sql_unittests",
 | 
|        {
 | 
| -        "test": "ui_base_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "sync_integration_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sync_unit_tests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "ui_touch_selection_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_base_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "sync_integration_tests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_touch_selection_unittests"
 | 
|        },
 | 
| -      "sync_unit_tests",
 | 
|        {
 | 
| -        "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": [
 | 
|        {
 | 
| @@ -193,396 +484,481 @@
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Linux Tests (dbg)(1)(32)": {
 | 
| +  "Linux Tests (dbg)(1)": {
 | 
|      "gtest_tests": [
 | 
|        {
 | 
| -        "test": "accessibility_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "accessibility_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "app_list_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "app_list_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": 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": "chromedriver_unittests"
 | 
|        },
 | 
| -      "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": "crypto_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "crypto_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "dbus_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "device_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "display_unittests"
 | 
|        },
 | 
| -      "dbus_unittests",
 | 
| -      "device_unittests",
 | 
| -      "display_unittests",
 | 
|        {
 | 
| -        "test": "events_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "events_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "extensions_browsertests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "extensions_browsertests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "extensions_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gcm_unit_tests"
 | 
|        },
 | 
| -      "extensions_unittests",
 | 
| -      "gcm_unit_tests",
 | 
|        {
 | 
| -        "test": "gfx_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gfx_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gn_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "google_apis_unittests"
 | 
|        },
 | 
| -      "google_apis_unittests",
 | 
|        {
 | 
| -        "test": "gpu_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gpu_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "interactive_ui_tests",
 | 
|          "swarming": {
 | 
| -          "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +          "can_use_on_swarming_builders": true,
 | 
| +          "shards": 3
 | 
| +        },
 | 
| +        "test": "interactive_ui_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_mojo_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "jingle_unittests"
 | 
|        },
 | 
| -      "ipc_mojo_unittests",
 | 
| -      "ipc_tests",
 | 
| -      "jingle_unittests",
 | 
|        {
 | 
| -        "test": "media_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"
 | 
|        },
 | 
| -      "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"
 | 
| +      },
 | 
| +      {
 | 
| +        "args": [
 | 
| +          "--test-launcher-print-test-stdio=always"
 | 
| +        ],
 | 
| +        "test": "sandbox_linux_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "skia_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sql_unittests"
 | 
|        },
 | 
| -      "ppapi_unittests",
 | 
| -      "printing_unittests",
 | 
| -      "remoting_unittests",
 | 
| -      "sandbox_linux_unittests",
 | 
| -      "sql_unittests",
 | 
|        {
 | 
| -        "test": "ui_base_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "sync_integration_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sync_unit_tests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "ui_touch_selection_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_base_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "sync_integration_tests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_touch_selection_unittests"
 | 
|        },
 | 
| -      "sync_unit_tests",
 | 
|        {
 | 
| -        "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": [
 | 
|        {
 | 
| +        "name": "telemetry_unittests",
 | 
| +        "script": "telemetry_unittests.py"
 | 
| +      },
 | 
| +      {
 | 
| +        "name": "telemetry_perf_unittests",
 | 
| +        "script": "telemetry_perf_unittests.py"
 | 
| +      },
 | 
| +      {
 | 
|          "name": "nacl_integration",
 | 
|          "script": "nacl_integration.py"
 | 
|        }
 | 
|      ]
 | 
|    },
 | 
| -  "Linux Tests (dbg)(1)": {
 | 
| +  "Linux Tests (dbg)(1)(32)": {
 | 
|      "gtest_tests": [
 | 
|        {
 | 
| -        "test": "accessibility_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "accessibility_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "app_list_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "app_list_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": 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": "chromedriver_unittests"
 | 
|        },
 | 
| -      "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": "crypto_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "crypto_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "dbus_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "device_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "display_unittests"
 | 
|        },
 | 
| -      "dbus_unittests",
 | 
| -      "device_unittests",
 | 
| -      "display_unittests",
 | 
|        {
 | 
| -        "test": "events_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "events_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "extensions_browsertests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "extensions_browsertests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "extensions_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gcm_unit_tests"
 | 
|        },
 | 
| -      "extensions_unittests",
 | 
| -      "gcm_unit_tests",
 | 
|        {
 | 
| -        "test": "gfx_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gfx_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "gn_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "google_apis_unittests"
 | 
|        },
 | 
| -      "google_apis_unittests",
 | 
|        {
 | 
| -        "test": "gpu_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "gpu_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "interactive_ui_tests",
 | 
|          "swarming": {
 | 
| -          "can_use_on_swarming_builders": true,
 | 
| -          "shards": 3
 | 
| -        }
 | 
| +          "can_use_on_swarming_builders": true
 | 
| +        },
 | 
| +        "test": "interactive_ui_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_mojo_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "ipc_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "jingle_unittests"
 | 
|        },
 | 
| -      "ipc_mojo_unittests",
 | 
| -      "ipc_tests",
 | 
| -      "jingle_unittests",
 | 
|        {
 | 
| -        "test": "media_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"
 | 
|        },
 | 
| -      "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"
 | 
|        },
 | 
| -      "ppapi_unittests",
 | 
| -      "printing_unittests",
 | 
| -      "remoting_unittests",
 | 
|        {
 | 
| -        "test": "sandbox_linux_unittests",
 | 
| -        "args": ["--test-launcher-print-test-stdio=always"]
 | 
| +        "test": "ppapi_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "printing_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "remoting_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sandbox_linux_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "skia_unittests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sql_unittests"
 | 
|        },
 | 
| -      "sql_unittests",
 | 
|        {
 | 
| -        "test": "ui_base_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "sync_integration_tests"
 | 
| +      },
 | 
| +      {
 | 
| +        "test": "sync_unit_tests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "ui_touch_selection_unittests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_base_unittests"
 | 
|        },
 | 
|        {
 | 
| -        "test": "sync_integration_tests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "ui_touch_selection_unittests"
 | 
|        },
 | 
| -      "sync_unit_tests",
 | 
|        {
 | 
| -        "test": "unit_tests",
 | 
|          "swarming": {
 | 
|            "can_use_on_swarming_builders": true
 | 
| -        }
 | 
| +        },
 | 
| +        "test": "unit_tests"
 | 
|        },
 | 
| -      "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"
 | 
|        },
 | 
|        {
 | 
| -        "name": "nacl_integration",
 | 
| -        "script": "nacl_integration.py"
 | 
| -      }
 | 
| -    ]
 | 
| -  },
 | 
| -  "Linux Clang (dbg)": {
 | 
| -    "gtest_tests": [
 | 
| -      "accessibility_unittests",
 | 
| -      "app_shell_unittests",
 | 
| -      "base_unittests",
 | 
| -      "components_unittests",
 | 
| -      "content_unittests",
 | 
| -      "crypto_unittests",
 | 
| -      "device_unittests",
 | 
| -      "display_unittests",
 | 
| -      "extensions_unittests",
 | 
| -      "google_apis_unittests",
 | 
| -      "ipc_mojo_unittests",
 | 
| -      "ipc_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",
 | 
| -      "sandbox_linux_unittests",
 | 
| -      "sql_unittests",
 | 
| -      "sync_unit_tests",
 | 
| -      "ui_base_unittests",
 | 
| -      "unit_tests",
 | 
| -      "skia_unittests"
 | 
| -    ]
 | 
| -  },
 | 
| -  "Android Tests (dbg)": {
 | 
| -    "scripts": [
 | 
| -      {
 | 
| -        "name": "check_licenses",
 | 
| -        "script": "webview_licenses.py"
 | 
| +        "test": "wm_unittests"
 | 
|        }
 | 
| -    ]
 | 
| -  },
 | 
| -  "Android Tests": {
 | 
| +    ],
 | 
|      "scripts": [
 | 
|        {
 | 
| -        "name": "check_licenses",
 | 
| -        "script": "webview_licenses.py"
 | 
| +        "name": "nacl_integration",
 | 
| +        "script": "nacl_integration.py"
 | 
|        }
 | 
|      ]
 | 
|    }
 | 
| 
 |