[Android] Revert 175082

build/android/pylib/python_test_base.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.
 
 """Base class for Android Python-driven tests.
 
 This test case is intended to serve as the base class for any Python-driven
 tests. It is similar to the Python unitttest module in that the user's tests
 inherit from this case and add their tests in that case.
 
 When a PythonTestBase object is instantiated, its purpose is to run only one of
 its tests. The test runner gives it the name of the test the instance will
 run. The test runner calls SetUp with the Android device ID which the test will
 run against. The runner runs the test method itself, collecting the result,
 and calls TearDown.
 
 Tests can basically do whatever they want in the test methods, such as call
 Java tests using _RunJavaTests. Those methods have the advantage of massaging
 the Java test results into Python test results.
 """
 
 import logging
 import os
 import time
 
 import android_commands
+import apk_info
 from run_java_tests import TestRunner
 from test_result import SingleTestResult, TestResults
-from utils import apk_and_jar_info
 
 
 # aka the parent of com.google.android
 BASE_ROOT = 'src' + os.sep
 
 
 class PythonTestBase(object):
   """Base class for Python-driven tests."""
 
   def __init__(self, test_name):
@@ skipping 28 matching lines @@
 
     Args:
       fname: filename for the test (e.g. foo/bar/baz/tests/FooTest.py)
       suite: name of the Java test suite (e.g. FooTest)
       test: name of the test method to run (e.g. testFooBar)
 
     Returns:
       TestResults object with a single test result.
     """
     test = self._ComposeFullTestName(fname, suite, test)
-    apks = [apk_and_jar_info.ApkAndJarInfo(self.options.test_apk_path,
-                                           self.options.test_apk_jar_path)]
+    apks = [apk_info.ApkInfo(self.options.test_apk_path,
+            self.options.test_apk_jar_path)]
     java_test_runner = TestRunner(self.options, self.device_id, [test], False,
                                   self.shard_index,
                                   apks,
                                   self.ports_to_forward)
     return java_test_runner.Run()
 
   def _RunJavaTests(self, fname, tests):
     """Calls a list of tests and stops at the first test failure.
 
     This method iterates until either it encounters a non-passing test or it
@@ skipping 73 matching lines @@
 
   def _ComposeFullTestName(self, fname, suite, test):
     package_name = self._GetPackageName(fname)
     return package_name + '.' + suite + '#' + test
 
   def _GetPackageName(self, fname):
     """Extracts the package name from the test file path."""
     dirname = os.path.dirname(fname)
     package = dirname[dirname.rfind(BASE_ROOT) + len(BASE_ROOT):]
     return package.replace(os.sep, '.')