Specify the test files to be used as an argument to the instrumentation tests

build/android/pylib/run_java_tests.py

Index: build/android/pylib/run_java_tests.py
diff --git a/build/android/pylib/run_java_tests.py b/build/android/pylib/run_java_tests.py
index 4e61e2da3a2698bdc453730a78935c332fd3b1a0..f80f1079001286f9818f69c7cbe56c4f3d02b759 100644
--- a/build/android/pylib/run_java_tests.py
+++ b/build/android/pylib/run_java_tests.py
@@ -118,6 +118,7 @@ class TestRunner(BaseTestRunner):
 
     self.build_type = options.build_type
     self.install_apk = options.install_apk
+    self.test_data = options.test_data
     self.save_perf_json = options.save_perf_json
     self.screenshot_failures = options.screenshot_failures
     self.wait_for_debugger = options.wait_for_debugger
@@ -162,12 +163,10 @@ class TestRunner(BaseTestRunner):
       logging.warning('Already copied test files to device %s, skipping.',
                       self.device)
       return
-    host_test_files = [
-        ('android_webview/test/data/device_files', 'webview'),
-        ('content/test/data/android/device_files', 'content'),
-        ('chrome/test/data/android/device_files', 'chrome')
-    ]
-    for (host_src, dst_layer) in host_test_files:
+    for copy_pair in self.test_data:

[bulach, 2012/11/22 17:09:04]

nit: maybe dest_host_pair would be clearer?

[Anthony Berent, 2012/11/22 17:37:23]

Done.

+      dst_src =copy_pair.split(':',1)

[bulach, 2012/11/22 17:09:04]

nit:s/=c/= c/

[Anthony Berent, 2012/11/22 17:37:23]

Done.

+      host_src = dst_src[1]
+      dst_layer = dst_src[0]

[bulach, 2012/11/22 17:09:04]

nit: seems clearer doing the [0] first

[Anthony Berent, 2012/11/22 17:37:23]

Done.

       host_test_files_path = constants.CHROME_DIR + '/' + host_src
       if os.path.exists(host_test_files_path):
         self.adb.PushIfNeeded(host_test_files_path,