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

build/android/pylib/base/base_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.
 
 """Base class for running tests on a single device."""
 
 import contextlib
 import httplib
 import logging
 import os
@@ skipping 63 matching lines @@
 
     Args:
       test: A test to run.
 
     Returns:
       Tuple containing:
         (base_test_result.TestRunResults, tests to rerun or None)
     """
     raise NotImplementedError
 
-  def PushDependencies(self):
-    """Push all dependencies to device once before all tests are run."""
+  def InstallTestPackage(self):
+    """Installs the test package once before all tests are run."""
+    pass
+
+  def PushDataDeps(self):
+    """Push all data deps to device once before all tests are run."""
     pass
 
   def SetUp(self):
     """Run once before all tests are run."""
     Forwarder.KillDevice(self.adb, self.tool)
+    self.InstallTestPackage()
     if self._push_deps:
-      logging.info('Pushing deps to device.')
-      self.PushDependencies()
+      logging.info('Pushing data deps to device.')
+      self.PushDataDeps()
     else:
-      logging.warning('Skipping pushing deps to device.')
+      logging.warning('Skipping pushing data deps to device.')
 
   def TearDown(self):
     """Run once after all tests are run."""
     self.ShutdownHelperToolsForTestSuite()
 
   def CopyTestData(self, test_data_paths, dest_dir):
     """Copies |test_data_paths| list of files/directories to |dest_dir|.
 
     Args:
       test_data_paths: A list of files or directories relative to |dest_dir|
@@ skipping 104 matching lines @@
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()