[Android] Reland of 'Add zip pushing and refine push mode selection.'

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 logging
 import os
 import re
 
 from pylib import constants
 from pylib import pexpect
@@ skipping 52 matching lines @@
   def PushDataDeps(self):
     self.device.WaitUntilFullyBooted(timeout=20)
     self.tool.CopyFiles()
     if os.path.exists(constants.ISOLATE_DEPS_DIR):
       # TODO(frankf): linux_dumper_unittest_helper needs to be in the same dir
       # as breakpad_unittests exe. Find a better way to do this.
       if self.test_package.suite_name == 'breakpad_unittests':
         device_dir = constants.TEST_EXECUTABLE_DIR
       else:
         device_dir = self.device.GetExternalStoragePath()
-      for p in os.listdir(constants.ISOLATE_DEPS_DIR):
-        self.device.PushChangedFiles(
-            os.path.join(constants.ISOLATE_DEPS_DIR, p),
+      self.device.PushChangedFiles(
+          [(os.path.join(constants.ISOLATE_DEPS_DIR, p),
             os.path.join(device_dir, p))
+           for p in os.listdir(constants.ISOLATE_DEPS_DIR)])
 
   def _ParseTestOutput(self, p):
     """Process the test output.
 
     Args:
       p: An instance of pexpect spawn class.
 
     Returns:
       A TestRunResults object.
     """
@@ skipping 102 matching lines @@
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()