Add option to push files to device using isolate for instrumentation tests.

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 logging
 import time
 
 from pylib import ports
@@ skipping 54 matching lines @@
     Returns:
       Tuple containing:
         (base_test_result.TestRunResults, tests to rerun or None)
     """
     raise NotImplementedError
 
   def InstallTestPackage(self):
     """Installs the test package once before all tests are run."""
     pass
 
-  def PushDataDeps(self):

[jbudorick, 2014/11/03 15:52:32]

Isn't this a merge conflict with your other CL?

[mikecase (-- gone --), 2014/11/03 19:20:05]

Super simple rebase. Just will need to remove 1 line.

-    """Push all data deps to device once before all tests are run."""
-    pass
-
   def SetUp(self):
     """Run once before all tests are run."""
     self.InstallTestPackage()
-    push_size_before = self.device.old_interface.GetPushSizeInfo()
-    if self._push_deps:
-      logging.warning('Pushing data files to device.')
-      self.PushDataDeps()
-      push_size_after = self.device.old_interface.GetPushSizeInfo()
-      logging.warning(
-          'Total data: %0.3fMB' %
-          ((push_size_after[0] - push_size_before[0]) / float(2 ** 20)))
-      logging.warning(
-          'Total data transferred: %0.3fMB' %
-          ((push_size_after[1] - push_size_before[1]) / float(2 ** 20)))
-    else:
-      logging.warning('Skipping pushing data to device.')
 
   def TearDown(self):
     """Run once after all tests are run."""
     self.ShutdownHelperToolsForTestSuite()
     if self._cleanup_test_files:
       self.device.old_interface.RemovePushedFiles()
 
   def LaunchTestHttpServer(self, document_root, port=None,
                            extra_config_contents=None):
     """Launches an HTTP server to serve HTTP tests.
@@ skipping 87 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()