🐾 Reland of Enable instrumentation tests on Android Swarm Builder

testing/buildbot/chromium.android.json

Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index f0da75c1b0cb5493f9ce838e528dda1e228bb8b5..3b4b3b6452c8c3187ed8d10ed3ebd0c5d371134f 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -19,6 +19,19 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
+          ],
+          "hard_timeout": 960
+        },
+        "test": "android_webview_test"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",
+              "device_type": "hammerhead"
+            }
           ]
         },
         "test": "android_webview_unittests"
@@ -43,9 +56,10 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
-          ]
+          ],
+          "hard_timeout": 960
         },
-        "test": "blimp_unittests"
+        "test": "blimp_test"
       },
       {
         "swarming": {
@@ -57,7 +71,7 @@
             }
           ]
         },
-        "test": "breakpad_unittests"
+        "test": "blimp_unittests"
       },
       {
         "swarming": {
@@ -69,7 +83,7 @@
             }
           ]
         },
-        "test": "cc_unittests"
+        "test": "breakpad_unittests"
       },
       {
         "swarming": {
@@ -81,7 +95,7 @@
             }
           ]
         },
-        "test": "components_browsertests"
+        "test": "cc_unittests"
       },
       {
         "swarming": {
@@ -91,9 +105,10 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
-          ]
+          ],
+          "hard_timeout": 1200
         },
-        "test": "components_unittests"
+        "test": "chrome_public_test"
       },
       {
         "swarming": {
@@ -103,9 +118,10 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
-          ]
+          ],
+          "hard_timeout": 960
         },
-        "test": "content_browsertests"
+        "test": "chrome_sync_shell_test"
       },
       {
         "swarming": {
@@ -117,7 +133,7 @@
             }
           ]
         },
-        "test": "content_unittests"
+        "test": "components_browsertests"
       },
       {
         "swarming": {
@@ -129,7 +145,7 @@
             }
           ]
         },
-        "test": "device_unittests"
+        "test": "components_unittests"
       },
       {
         "swarming": {
@@ -139,9 +155,10 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
-          ]
+          ],
+          "hard_timeout": 960
         },
-        "test": "events_unittests"
+        "test": "content_browsertests"
       },
       {
         "swarming": {
@@ -151,9 +168,10 @@
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
-          ]
+          ],
+          "hard_timeout": 960
         },
-        "test": "gl_tests"
+        "test": "content_shell_test"
       },
       {
         "swarming": {
@@ -165,7 +183,7 @@
             }
           ]
         },
-        "test": "gpu_unittests"
+        "test": "content_unittests"
       },
       {
         "swarming": {
@@ -177,7 +195,7 @@
             }
           ]
         },
-        "test": "ipc_tests"
+        "test": "device_unittests"
       },
       {
         "swarming": {
@@ -189,7 +207,7 @@
             }
           ]
         },
-        "test": "media_unittests"
+        "test": "events_unittests"
       },
       {
         "swarming": {
@@ -201,7 +219,7 @@
             }
           ]
         },
-        "test": "net_unittests"
+        "test": "gl_tests"
       },
       {
         "swarming": {
@@ -213,7 +231,7 @@
             }
           ]
         },
-        "test": "sandbox_linux_unittests"
+        "test": "gpu_unittests"
       },
       {
         "swarming": {
@@ -225,7 +243,7 @@
             }
           ]
         },
-        "test": "sql_unittests"
+        "test": "ipc_tests"
       },
       {
         "swarming": {
@@ -237,7 +255,7 @@
             }
           ]
         },
-        "test": "sync_unit_tests"
+        "test": "media_unittests"
       },
       {
         "swarming": {
@@ -249,7 +267,7 @@
             }
           ]
         },
-        "test": "ui_android_unittests"
+        "test": "net_unittests"
       },
       {
         "swarming": {
@@ -261,7 +279,7 @@
             }
           ]
         },
-        "test": "ui_base_unittests"
+        "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
@@ -273,7 +291,7 @@
             }
           ]
         },
-        "test": "ui_touch_selection_unittests"
+        "test": "sql_unittests"
       },
       {
         "swarming": {
@@ -285,15 +303,9 @@
             }
           ]
         },
-        "test": "unit_tests"
-      }
-    ],
-    "instrumentation_tests": [
+        "test": "sync_unit_tests"
+      },
       {
-        "apk_under_test": "Blimp.apk",
-        "override_compile_targets": [
-          "blimp_test_apk"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -303,8 +315,7 @@
             }
           ]
         },
-        "test": "blimp_test_apk",
-        "test_apk": "BlimpTest.apk"
+        "test": "ui_android_unittests"
       },
       {
         "swarming": {
@@ -316,7 +327,7 @@
             }
           ]
         },
-        "test": "chrome_public_test_apk"
+        "test": "ui_base_unittests"
       },
       {
         "swarming": {
@@ -328,7 +339,7 @@
             }
           ]
         },
-        "test": "chrome_sync_shell_test_apk"
+        "test": "ui_touch_selection_unittests"
       },
       {
         "swarming": {
@@ -340,7 +351,7 @@
             }
           ]
         },
-        "test": "content_shell_test_apk"
+        "test": "unit_tests"
       }
     ]
   },