Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipe_modules/cronet/api.py

 # Copyright 2014 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.
 
 """Common steps for recipes that sync/build Cronet sources."""
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 class CronetApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(CronetApi, self).__init__(**kwargs)
     self._repo_path = None
 
   INSTRUMENTATION_TESTS = freeze([
     {
-      'test': 'CronetSampleTest',
-      'gyp_target': 'cronet_sample_test_apk',
-      'apk_under_test': 'CronetSample.apk',
-      'test_apk': 'CronetSampleTest.apk',
-      'additional_apks': [
-        'ChromiumNetTestSupport.apk',
-      ],
+      'target': 'cronet_sample_test_apk',
     },
     {
-      'test': 'CronetTestInstrumentation',
-      'gyp_target': 'cronet_test_instrumentation_apk',
-      'apk_under_test': 'CronetTest.apk',
-      'test_apk': 'CronetTestInstrumentation.apk',
-      'additional_apks': [
-        'ChromiumNetTestSupport.apk',
-      ],
-      'isolate_file_path':
-        'components/cronet/android/cronet_test_instrumentation_apk.isolate',
+      'target': 'cronet_test_instrumentation_apk',
     },
   ])
 
   UNIT_TESTS = freeze([
     'cronet_unittests',
     'net_unittests',
   ])
 
   DASHBOARD_UPLOAD_URL = 'https://chromeperf.appspot.com'
 
@@ skipping 59 matching lines @@
       self, build_config, unit_tests=UNIT_TESTS,
       instrumentation_tests=INSTRUMENTATION_TESTS):
     droid = self.m.chromium_android
     checkout_path = self.m.path['checkout']
     droid.common_tests_setup_steps()
     with self.m.step.defer_results():
       for suite in unit_tests:
         droid.run_test_suite(suite, shard_timeout=180)
       for suite in instrumentation_tests:
         droid.run_instrumentation_suite(
-            name=suite['test'],
-            apk_under_test=droid.apk_path(suite.get('apk_under_test')),
-            test_apk=droid.apk_path(suite.get('test_apk')),
-            additional_apks=[
-                droid.apk_path(a) for a in suite.get('additional_apks') or ()],
-            isolate_file_path=suite.get('isolate_file_path'),
+            name=suite['target'],
             verbose=True,
+            wrapper_script_suite_name=suite['target'],
             num_retries=0,
             **suite.get('kwargs', {}))
       droid.common_tests_final_steps()