Revert of [Android] Add an out-of-app instrumentation driver APK.

build/android/pylib/local/device/local_device_instrumentation_test_run.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.
 
 import logging
 import re
 import time
 
 from pylib import flag_changer
 from pylib.base import base_test_result
@@ skipping 112 matching lines @@
   #override
   def _GetTests(self):
     return self._test_instance.GetTests()
 
   #override
   def _GetTestName(self, test):
     return '%s#%s' % (test['class'], test['method'])
 
   #override
   def _RunTest(self, device, test):
-    extras = self._test_instance.GetHttpServerEnvironmentVars()
+    test_name = self._GetTestName(test)
+    logging.info('preparing to run %s: %s' % (test_name, test))
 
-    if isinstance(test, list):
-      if not self._test_instance.driver_apk:
-        raise Exception('driver_apk does not exist. '
-                        'Please build it and try again.')
-
-      def name_and_timeout(t):
-        n = self._GetTestName(t)
-        i = self._GetTimeoutFromAnnotations(t['annotations'], n)
-        return (n, i)
-
-      test_names, timeouts = zip(*(name_and_timeout(t) for t in test))
-
-      test_name = ','.join(test_names)
-      target = '%s/%s' % (
-          self._test_instance.driver_package,
-          self._test_instance.driver_name)
-      extras.update(
-          self._test_instance.GetDriverEnvironmentVars(
-              test_list=test_names))
-      timeout = sum(timeouts)
-    else:
-      test_name = self._GetTestName(test)
-      target = '%s/%s' % (
-          self._test_instance.test_package, self._test_instance.test_runner)
-      extras['class'] = test_name
-      timeout = self._GetTimeoutFromAnnotations(test['annotations'], test_name)
-
-    logging.info('preparing to run %s: %s' % (test_name, test))
+    extras = {
+      'class': test_name,
+      'org.chromium.chrome.test.ChromeInstrumentationTestRunner'
+          '.EnableTestHttpServer': '',
+    }
+    timeout = self._GetTimeoutFromAnnotations(test['annotations'], test_name)
 
     time_ms = lambda: int(time.time() * 1e3)
     start_ms = time_ms()
     output = device.StartInstrumentation(
-        target, raw=True, extras=extras, timeout=timeout, retries=0)
+        '%s/%s' % (self._test_instance.test_package,
+                   self._test_instance.test_runner),
+        raw=True, extras=extras, timeout=timeout, retries=0)
     duration_ms = time_ms() - start_ms
 
     # TODO(jbudorick): Make instrumentation tests output a JSON so this
     # doesn't have to parse the output.
     logging.debug('output from %s:', test_name)
     for l in output:
       logging.debug('  %s', l)
 
     result_code, result_bundle, statuses = (
         self._test_instance.ParseAmInstrumentRawOutput(output))
@@ skipping 20 matching lines @@
 
     try:
       scale = int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       scale = 1
     timeout *= scale
 
     return timeout