Android: Add test runner scripts to run content_browsertests.

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 479a907a48b9544b2554ea9edb7f2285cfdb992b..66004ea24bb8ed24656aee0d8f467e24797327e3 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -127,6 +127,10 @@ def _GetDataFilesForTestSuite(test_suite_basename):
     return [
       'cc/test/data',
     ]
+  elif test_suite_basename == 'content_browsertests':
+    return [
+      'content/test/data',
+    ]
   return []
 
 
@@ -144,11 +148,15 @@ class TestRunner(BaseTestRunner):
     shard_index: index number of the shard on which the test suite will run.
     build_type: 'Release' or 'Debug'.
     in_webkit_checkout: Whether the suite is being run from a WebKit checkout.
+    test_apk_package_name: Apk package name for tests running in APKs.
+    test_activity_name: Test activity to invoke for APK tests.
+    command_line_file: Filename to use to pass arguments to tests.
   """
 
   def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
                cleanup_test_files, tool_name, shard_index, build_type,
-               in_webkit_checkout):
+               in_webkit_checkout, test_apk_package_name, test_activity_name,
+               command_line_file):
     BaseTestRunner.__init__(self, device, tool_name, shard_index, build_type)
     self._running_on_emulator = self.device.startswith('emulator')
     self._gtest_filter = gtest_filter
@@ -164,7 +172,10 @@ class TestRunner(BaseTestRunner):
           test_suite,
           timeout,
           cleanup_test_files,
-          self.tool)
+          self.tool,
+          test_apk_package_name,
+          test_activity_name,
+          command_line_file)
     else:
       # Put a copy into the android out/target directory, to allow stack trace
       # generation.
@@ -181,7 +192,8 @@ class TestRunner(BaseTestRunner):
   def _TestSuiteRequiresMockTestServer(self):
     """Returns True if the test suite requires mock test server."""
     tests_require_net_test_server = ['unit_tests', 'net_unittests',
-                                     'content_unittests']
+                                     'content_unittests',
+                                     'content_browsertests']
     return (self.test_package.test_suite_basename in
             tests_require_net_test_server)