[Android] Revert 175082

build/android/pylib/run_python_tests.py

 # Copyright (c) 2012 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.
 
 """Runs the Python tests (relies on using the Java test runner)."""
 
 import logging
 import os
 import sys
 import types
 
 import android_commands
+import apk_info
 import constants
 import python_test_base
 from python_test_caller import CallPythonTest
 from python_test_sharder import PythonTestSharder
 import run_java_tests
 from run_java_tests import FatalTestException
 from test_info_collection import TestInfoCollection
 from test_result import TestResults
-from utils import apk_and_jar_info
 
 
 def _GetPythonFiles(root, files):
   """Returns all files from |files| that end in 'Test.py'.
 
   Args:
     root: A directory name with python files.
     files: A list of file names.
 
   Returns:
@@ skipping 45 matching lines @@
     logging.warning('No Python tests to run with current args.')
     return TestResults()
 
   available_tests *= options.number_of_runs
   test_names = [t.qualified_name for t in available_tests]
   logging.debug('Final list of tests to run: ' + str(test_names))
 
   # Copy files to each device before running any tests.
   for device_id in attached_devices:
     logging.debug('Pushing files to device %s', device_id)
-    apks = [apk_and_jar_info.ApkAndJarInfo(options.test_apk_path,
-                                           options.test_apk_jar_path)]
+    apks = [apk_info.ApkInfo(options.test_apk_path, options.test_apk_jar_path)]
     test_files_copier = run_java_tests.TestRunner(options, device_id,
                                                   None, False, 0, apks, [])
     test_files_copier.CopyTestFilesOnce()
 
   # Actually run the tests.
   if len(attached_devices) > 1 and options.wait_for_debugger:
     logging.warning('Debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   logging.debug('Running Python tests')
@@ skipping 100 matching lines @@
   Returns:
     List of test case objects for all available test methods.
   """
   if not test_root:
     return []
   all_tests = []
   test_module_list = _GetTestModules(test_root, is_official_build)
   for module in test_module_list:
     all_tests.extend(_GetTestClassesFromModule(module))
   return all_tests