👔 Make instrumentation tests declare their runtime_deps

testing/buildbot/gn_isolate_map.pyl

 ## Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # gn_isolate_map.pyl - A mapping of Ninja build target names to GN labels and
 # test type classifications for the tests that are run on the bots.
 #
 # This mapping is used by MB so that we can uniformly refer to test binaries
 # by their Ninja target names in the recipes and not need to worry about how
 # they are referred to in GN or GYP specifically (the GYP target name is pretty
@@ skipping 50 matching lines @@
 # "//testing/scripts/foo.py".
 
 {
   "accessibility_unittests":  {
     "label": "//ui/accessibility:accessibility_unittests",
     "type": "raw",
     "args": [],
   },
   "android_webview_test": {
     "label": "//android_webview/test:android_webview_test_apk",
-    "type": "console_test_launcher",
+    "type": "android_instrumentation",
   },
   "android_webview_unittests": {
     "label": "//android_webview/test:android_webview_unittests",
     "type": "console_test_launcher",
   },
   "angle_deqp_egl_tests": {
     "label": "//third_party/angle/src/tests:angle_deqp_egl_tests",
     "type": "raw",
     "args": [],
   },
@@ skipping 45 matching lines @@
   "base_unittests": {
     "label": "//base:base_unittests",
     "type": "console_test_launcher",
   },
   "battor_agent_unittests": {
     "label": "//tools/battor_agent:battor_agent_unittests",
     "type": "console_test_launcher",
   },
   "blimp_test": {
     "label": "//blimp/client:blimp_test_apk",
-    "type": "console_test_launcher",
+    "type": "android_instrumentation",
   },
   "blimp_unittests": {
     "label": "//blimp:blimp_unittests",
     "type": "console_test_launcher",
   },
   "blink_heap_unittests": {
     "label": "//third_party/WebKit/Source/platform:blink_heap_unittests",
     "type": "console_test_launcher",
   },
   "blink_platform_unittests": {
@@ skipping 38 matching lines @@
   "chrome_app_unittests": {
     "label": "//chrome/test:chrome_app_unittests",
     "type": "console_test_launcher",
   },
   "chrome_elf_unittests": {
     "label": "//chrome_elf:chrome_elf_unittests",
     "type": "raw",
   },
   "chrome_public_test": {
     "label": "//chrome/android:chrome_public_test_apk",
-    "type": "console_test_launcher",
+    "type": "android_instrumentation",
   },
   "chrome_sync_shell_test": {
     "label": "//chrome/android:chrome_sync_shell_test_apk",
-    "type": "console_test_launcher",
+    "type": "android_instrumentation",
   },
   "chromedriver_unittests": {
     "label": "//chrome/test/chromedriver:chromedriver_unittests",
     "type": "windowed_test_launcher",
   },
   "chromeos_unittests": {
     "label": "//chromeos:chromeos_unittests",
     "type": "console_test_launcher",
   },
   "components_browsertests": {
@@ skipping 14 matching lines @@
   },
   "content_site_isolation_browsertests": {
     "label": "//content/test:content_site_isolation_browsertests",
     "label_type": "group",
     "type": "windowed_test_launcher",
     "executable": "content_browsertests",
     "args": ["--site-per-process", "--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.content_browsertests.filter"],
   },
   "content_shell_test": {
     "label": "//content/shell/android:content_shell_test_apk",
-    "type": "console_test_launcher",
+    "type": "android_instrumentation",
   },
   "content_unittests": {
     "label": "//content/test:content_unittests",
     "type": "windowed_test_launcher",
   },
   "courgette_unittests": {
     "label": "//courgette:courgette_unittests",
     "type": "console_test_launcher",
   },
   "crypto_unittests": {
@@ skipping 339 matching lines @@
   },
   "wm_unittests": {
     "label": "//ui/wm:wm_unittests",
     "type": "windowed_test_launcher",
   },
   "wtf_unittests": {
     "label": "//third_party/WebKit/Source/wtf:wtf_unittests",
     "type": "console_test_launcher",
   },
 }