[Android] Use isolate remap instead of check.

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 93 matching lines @@
       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()
 
-  def CopyTestData(self, test_data_paths, dest_dir):
-    """Copies |test_data_paths| list of files/directories to |dest_dir|.
+  def CopyTestData(self, test_data_paths, dest_root,
+                   src_root=constants.DIR_SOURCE_ROOT):

[bulach, 2013/07/04 11:05:21]

suggestion: there's only one caller passing the extra param, and this function
is fairly simple as it is.. so maybe it'd be better to have a
_PushDepsDirs(self) down in the test_runner.py itself? it doesn't even need any
param, it can access self.adb and self._deps_dir directly:

def _PushDepsDirs(self):
  for p in os.listdir(self._deps_dir):
    self.adb.PushIfNeeded(
        os.path.join(self._deps_dir, p)),
        os.path.join(self.adb.GetStoragePath(), p)


to be fair, it doesn't even need this function:
the caller has current 3 lines, if we just inline this it'd be 4 :)

[frankf, 2013/07/09 01:09:35]

Done. I've inlined CopyTestData and removed it all together. The only other
invocation was done by instrumentation test runner.

On 2013/07/04 11:05:21, bulach wrote:

+    """Copies a list of paths from |src_root| to |dst_root|.
 
     Args:
-      test_data_paths: A list of files or directories relative to |dest_dir|
-          which should be copied to the device. The paths must exist in
-          |DIR_SOURCE_ROOT|.
-      dest_dir: Absolute path to copy to on the device.
+      test_data_paths: A list of paths relative to root directories.
+      dest_root: Absolute root path on device.
+      src_root: Absolute root path on host.
     """
     for p in test_data_paths:
       self.adb.PushIfNeeded(
-          os.path.join(constants.DIR_SOURCE_ROOT, p),
-          os.path.join(dest_dir, p))
+          os.path.join(src_root, p),
+          os.path.join(dest_root, p))
 
   def LaunchTestHttpServer(self, document_root, port=None,
                            extra_config_contents=None):
     """Launches an HTTP server to serve HTTP tests.
 
     Args:
       document_root: Document root of the HTTP server.
       port: port on which we want to the http server bind.
       extra_config_contents: Extra config contents for the HTTP server.
     """
@@ skipping 86 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()