Reland #4 of Switch Android gtests to use generated wrapper scripts

scripts/slave/recipes/emulator.py

Index: scripts/slave/recipes/emulator.py
diff --git a/scripts/slave/recipes/emulator.py b/scripts/slave/recipes/emulator.py
index 4f44f5fd431dab41e7ccf1a1a0af0fb7f675c6d9..a2b66a4e6ac2784aa4f073d482667414f500fe35 100644
--- a/scripts/slave/recipes/emulator.py
+++ b/scripts/slave/recipes/emulator.py
@@ -20,18 +20,18 @@
 REPO_URL = 'https://chromium.googlesource.com/chromium/src.git'
 
 UNITTESTS = freeze([
-  ['android_webview_unittests', None],
-  ['base_unittests', ['base', 'base_unittests.isolate']],
-  ['cc_unittests', None],
-  ['components_unittests', ['components', 'components_unittests.isolate']],
-  ['events_unittests', None],
-  ['gl_tests', None],
-  ['ipc_tests', None],
-  ['skia_unittests', None],
-  ['sql_unittests', ['sql', 'sql_unittests.isolate']],
-  ['sync_unit_tests', ['sync', 'sync_unit_tests.isolate']],
-  ['ui_android_unittests', None],
-  ['ui_touch_selection_unittests', None],
+  'android_webview_unittests',
+  'base_unittests',
+  'cc_unittests',
+  'components_unittests',
+  'events_unittests',
+  'gl_tests',
+  'ipc_tests',
+  'skia_unittests',
+  'sql_unittests',
+  'sync_unit_tests',
+  'ui_android_unittests',
+  'ui_touch_selection_unittests',
 ])
 
 BUILDERS = freeze({
@@ -75,7 +75,9 @@
     api.chromium.run_mb(mastername, buildername, use_goma=True)
 
   targets = []
-  for target, _ in builder.get('unittests', []):
+  for target in builder.get('unittests', []):
+    # TODO(agrieve): Remove _apk suffix in favour of bin/run_${target} once GYP
+    #     is gone. http://crbug.com/599919
     targets.append(target + '_apk')
   api.chromium.compile(targets=targets)
 
@@ -97,12 +99,8 @@
 
     try:
       with api.step.defer_results():
-        for suite, isolate_file in builder.get('unittests', []):
-          isolate_file_path = (
-              api.path['checkout'].join(*isolate_file)
-              if isolate_file else None)
-          api.chromium_android.run_test_suite(
-              suite, isolate_file_path=isolate_file_path)
+        for suite in builder.get('unittests', []):
+          api.chromium_android.run_test_suite(suite)
     finally:
       api.chromium_android.logcat_dump()
       api.chromium_android.stack_tool_steps()