Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipe_modules/webrtc/steps.py

 # 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.
 
 
 def generate_tests(api, test_suite, revision, enable_swarming=False):
   tests = []
   if test_suite == 'webrtc':
     for test in api.NORMAL_TESTS:
       tests.append(WebRTCTest(test, revision, enable_swarming=enable_swarming))
@@ skipping 119 matching lines @@
   def run(self, api, suffix):
     api.m.chromium_android.run_test_suite(self._name,
                                           tool=get_android_tool(api),
                                           shard_timeout=self._SHARD_TIMEOUT)
 
 
 class AndroidInstrumentationTest(Test):
   """Installs the APK on the device and runs the test."""
   def __init__(self, name, test_config):
     super(AndroidInstrumentationTest, self).__init__(name)
-    self._apk_under_test = test_config.get('apk_under_test')
-    self._test_apk = test_config.get('test_apk')
 
   def run(self, api, suffix):
     api.m.chromium_android.run_instrumentation_suite(
         name=self._name,
-        apk_under_test=api.m.chromium_android.apk_path(self._apk_under_test),
-        test_apk=api.m.chromium_android.apk_path(self._test_apk),
         tool=get_android_tool(api),
         verbose=True)
 
 
 class AndroidPerfTest(Test):
   """A performance test to run on Android devices.
 
     Basically just wrap what happens in chromium_android.run_test_suite to run
     inside runtest.py so we can scrape perf data. This way we can get perf data
     from the gtest binaries since the way of running perf tests with telemetry
@@ skipping 19 matching lines @@
       args = ['gtest', '-s', self._name, '--verbose', '--release',
               '-t', str(self._SHARD_TIMEOUT)]
       tool = get_android_tool(api)
       api.add_test(name=self._name,
                    test=api.m.chromium_android.c.test_runner,
                    args=args,
                    revision=self._revision,
                    perf_test=True,
                    perf_dashboard_id=self._name)