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

build/android/pylib/gtest/test_package_exe.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.
 
 """Defines TestPackageExecutable to help run stand-alone executables."""
 
 import logging
 import os
 import sys
 import tempfile
@@ skipping 87 matching lines @@
                          '%s %s/%s --gtest_filter=%s %s\n'
                          'echo $? > %s' %
                          (constants.TEST_EXECUTABLE_DIR,
                           self._AddNativeCoverageExports(device),
                           tool_wrapper, constants.TEST_EXECUTABLE_DIR,
                           self.suite_name,
                           test_filter, test_arguments,
                           TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE))
     sh_script_file.flush()
     cmd_helper.RunCmd(['chmod', '+x', sh_script_file.name])
-    device.PushChangedFiles(
+    device.PushChangedFiles([(
         sh_script_file.name,
-        constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')
+        constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')])
     logging.info('Conents of the test runner script: ')
     for line in open(sh_script_file.name).readlines():
       logging.info('  ' + line.rstrip())
 
   #override
   def GetAllTests(self, device):
     all_tests = device.RunShellCommand(
         '%s %s/%s --gtest_list_tests' %
         (self.tool.GetTestWrapper(),
          constants.TEST_EXECUTABLE_DIR,
@@ skipping 20 matching lines @@
       target_mtime = os.stat(target_name).st_mtime
       source_mtime = os.stat(self.suite_path).st_mtime
       if target_mtime < source_mtime:
         raise Exception(
             'stripped binary (%s, timestamp %d) older than '
             'source binary (%s, timestamp %d), build target %s' %
             (target_name, target_mtime, self.suite_path, source_mtime,
              self.suite_name + '_stripped'))
 
     test_binary = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
-    device.PushChangedFiles(target_name, test_binary)
+    device.PushChangedFiles([(target_name, test_binary)])