Rename android_webview_test_apk

testing/buildbot/chromium.swarm.json

Index: testing/buildbot/chromium.swarm.json
diff --git a/testing/buildbot/chromium.swarm.json b/testing/buildbot/chromium.swarm.json
index 26fa62408f98b593cc6e6a6cb2c7f42c70fbd94b..0aa5581e845466fc4a20634fd0ccd4e4da8921f6 100644
--- a/testing/buildbot/chromium.swarm.json
+++ b/testing/buildbot/chromium.swarm.json
@@ -1,23 +1,6 @@
 {
   "Android N5 Swarm": {
     "gtest_tests": [
-      {
-        "override_compile_targets": [
-          "android_webview_test_apk"
-        ],
-        "override_isolate_target": "android_webview_test_apk",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "KTU84P",
-              "device_type": "hammerhead"
-            }
-          ],
-          "shards": 7
-        },
-        "test": "android_webview_test_apk"
-      },
       {
         "override_isolate_target": "base_unittests",
         "swarming": {
@@ -103,28 +86,28 @@
           "shards": 5
         },
         "test": "unit_tests"
-      }
-    ]
-  },
-  "Android N5X Swarm": {
-    "gtest_tests": [
+      },
       {
         "override_compile_targets": [
-          "android_webview_test_apk"
+          "webview_instrumentation_test_apk"
         ],
-        "override_isolate_target": "android_webview_test_apk",
+        "override_isolate_target": "webview_instrumentation_test_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "device_os": "MMB29Q",
-              "device_type": "bullhead"
+              "device_os": "KTU84P",
+              "device_type": "hammerhead"
             }
           ],
           "shards": 7
         },
-        "test": "android_webview_test_apk"
-      },
+        "test": "webview_instrumentation_test_apk"
+      }
+    ]
+  },
+  "Android N5X Swarm": {
+    "gtest_tests": [
       {
         "override_isolate_target": "base_unittests",
         "swarming": {
@@ -210,6 +193,23 @@
           "shards": 8
         },
         "test": "unit_tests"
+      },
+      {
+        "override_compile_targets": [
+          "webview_instrumentation_test_apk"
+        ],
+        "override_isolate_target": "webview_instrumentation_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "shards": 7
+        },
+        "test": "webview_instrumentation_test_apk"
       }
     ]
   },