[Android] Separate concepts of pushing test data and installing test apk.

build/android/pylib/gtest/test_runner.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.
 
 import glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 255 matching lines @@
       self.test_package = test_package_executable.TestPackageExecutable(
           self.adb,
           device,
           test_suite,
           timeout,
           self._cleanup_test_files,
           self.tool,
           symbols_dir)
 
   #override
-  def PushDependencies(self):
+  def InstallTestPackage(self):
     self.test_package.StripAndCopyExecutable()
     self.test_package.PushDataAndPakFiles()
+
+  #override
+  def PushDataDeps(self):
     self.tool.CopyFiles()
     test_data = _GetDataFilesForTestSuite(self.test_package.test_suite_basename)
     if test_data:
       # Make sure SD card is ready.
       self.adb.WaitForSdCardReady(20)
       for data in test_data:
         self.CopyTestData([data], self.adb.GetExternalStorage())
     optional_test_data = _GetOptionalDataFilesForTestSuite(
         self.test_package.test_suite_basename)
     if optional_test_data:
@@ skipping 75 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()