Rename android_webview_test_apk

testing/buildbot/chromium.android.fyi.json

 {
   "Android Tests (trial)(dbg)": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "blink_heap_unittests"
       },
       {
@@ skipping 197 matching lines @@
       },
       {
         "test": "ui_touch_selection_unittests"
       },
       {
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
-        "test": "android_webview_test_apk"
-      },
-      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
+      },
+      {
+        "test": "webview_instrumentation_test_apk"
       }
     ]
   },
   "Lollipop Low-end Tester": {
     "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": [
-            {
-              "android_devices": "1",
-              "device_os": "LMY47W",
-              "device_type": "sprout"
-            }
-          ],
-          "expiration": 14400,
-          "shards": 2
-        },
-        "test": "android_webview_test_apk"
-      },
-      {
         "override_isolate_target": "android_webview_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_os": "LMY47W",
               "device_type": "sprout"
             }
           ],
@@ skipping 439 matching lines @@
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_os": "LMY47W",
               "device_type": "sprout"
             }
           ],
           "expiration": 14400
         },
         "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": [
+            {
+              "android_devices": "1",
+              "device_os": "LMY47W",
+              "device_type": "sprout"
+            }
+          ],
+          "expiration": 14400,
+          "shards": 2
+        },
+        "test": "webview_instrumentation_test_apk"
       }
     ]
   },
   "Memory Infra Tester": {
     "isolated_scripts": [
       {
         "args": [
           "system_health.memory_mobile",
           "-v",
           "--upload-results",
@@ skipping 17 matching lines @@
             }
           ],
           "hard_timeout": 600
         }
       }
     ]
   },
   "Nougat Phone Tester": {
     "gtest_tests": [
       {
-        "override_compile_targets": [
-          "android_webview_test_apk"
-        ],
-        "override_isolate_target": "android_webview_test_apk",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "cipd_packages": [
-            {
-              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
-              "location": "bin",
-              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
-            }
-          ],
-          "dimension_sets": [
-            {
-              "android_devices": "1",
-              "device_os": "NRD91N",
-              "device_type": "bullhead"
-            }
-          ],
-          "expiration": 10800,
-          "hard_timeout": 1500,
-          "output_links": [
-            {
-              "link": [
-                "https://luci-logdog.appspot.com/v/?s",
-                "=android%2Fswarming%2Flogcats%2F",
-                "${TASK_ID}%2F%2B%2Funified_logcats"
-              ],
-              "name": "shard #${SHARD_INDEX} logcats"
-            }
-          ],
-          "shards": 6
-        },
-        "test": "android_webview_test_apk"
-      },
-      {
         "override_isolate_target": "android_webview_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
             }
           ],
@@ skipping 988 matching lines @@
               "link": [
                 "https://luci-logdog.appspot.com/v/?s",
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "vr_shell_unittests"
+      },
+      {
+        "override_compile_targets": [
+          "webview_instrumentation_test_apk"
+        ],
+        "override_isolate_target": "webview_instrumentation_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "1",
+              "device_os": "NRD91N",
+              "device_type": "bullhead"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 1500,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 6
+        },
+        "test": "webview_instrumentation_test_apk"
       }
     ]
   },
   "Unswarmed N5 Tests Dummy Builder": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "android_webview_unittests"
@@ skipping 158 matching lines @@
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
-        "test": "android_webview_test_apk"
-      },
-      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
+      },
+      {
+        "test": "webview_instrumentation_test_apk"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_perf_unittests",
         "script": "telemetry_perf_unittests.py"
       }
     ]
   },
   "Unswarmed N5X Tests Dummy Builder": {
@@ skipping 164 matching lines @@
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
-        "test": "android_webview_test_apk"
-      },
-      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
+      },
+      {
+        "test": "webview_instrumentation_test_apk"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_perf_unittests",
         "script": "telemetry_perf_unittests.py"
       }
     ]
   },
   "x64 Device Tester": {
     "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": [
-            {
-              "android_devices": "1",
-              "device_type": "coho"
-            }
-          ]
-        },
-        "test": "android_webview_test_apk"
-      },
-      {
         "override_isolate_target": "angle_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_type": "coho"
             }
           ]
         },
@@ skipping 587 matching lines @@
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_type": "coho"
             }
           ]
         },
         "test": "webkit_unit_tests"
       },
       {
-        "override_isolate_target": "wtf_unittests",
+        "override_compile_targets": [
+          "webview_instrumentation_test_apk"
+        ],
+        "override_isolate_target": "webview_instrumentation_test_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "1",
               "device_type": "coho"
             }
           ]
         },
+        "test": "webview_instrumentation_test_apk"
+      },
+      {
+        "override_isolate_target": "wtf_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "android_devices": "1",
+              "device_type": "coho"
+            }
+          ]
+        },
         "test": "wtf_unittests"
       }
     ]
   },
   "x86 Cloud Tester": {
     "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": [
-            {
-              "android_devices": "4",
-              "device_type": "gce_x86"
-            }
-          ],
-          "hard_timeout": 960
-        },
-        "test": "android_webview_test_apk"
-      },
-      {
         "override_isolate_target": "android_webview_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "4",
               "device_type": "gce_x86"
             }
           ]
         },
@@ skipping 426 matching lines @@
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "4",
               "device_type": "gce_x86"
             }
           ]
         },
         "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": [
+            {
+              "android_devices": "4",
+              "device_type": "gce_x86"
+            }
+          ],
+          "hard_timeout": 960
+        },
+        "test": "webview_instrumentation_test_apk"
       }
     ],
     "isolated_scripts": [
       {
         "args": [
           "--browser=android-chromium",
           "--device=android"
         ],
         "isolate_name": "telemetry_perf_unittests",
         "name": "telemetry_perf_unittests",
         "override_compile_targets": [
           "telemetry_perf_unittests"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "android_devices": "4",
               "device_type": "gce_x86"
             }
           ],
           "hard_timeout": 960,
           "shards": 1
         }
       }
     ]
   }
 }