Android: Add test runner scripts to run content_browsertests.

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 glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 103 matching lines @@
         'third_party/hyphen/hyph_en_US.dic',
         ]
   elif test_suite_basename == 'media_unittests':
     return [
         'media/test/data',
         ]
   elif test_suite_basename == 'cc_perftests':
     return [
       'cc/test/data',
     ]
+  elif test_suite_basename == 'content_browsertests':
+    return [
+      'content/test/data',
+    ]
   return []
 
 
 def _TestSuiteRequiresMockTestServer(test_suite_basename):
   """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 (test_suite_basename in
           tests_require_net_test_server)
 
 
 class TestRunner(base_test_runner.BaseTestRunner):
   """Single test suite attached to a single device.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     test_arguments: Additional arguments to pass to the test binary.
     timeout: Timeout for each test.
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool_name: Name of the Valgrind tool.
     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.

[craigdh, 2013/02/21 00:26:02]

Maybe create a struct-looking class that just holds these three fields as they
are associated and passed together everywhere.

[nilesh, 2013/02/21 18:04:13]

As discussed offline, I will keep the arguments separate for now.

+    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, test_arguments, timeout,
                cleanup_test_files, tool_name, build_type,
-               in_webkit_checkout):
+               in_webkit_checkout, test_apk_package_name, test_activity_name,
+               command_line_file):
     super(TestRunner, self).__init__(device, tool_name, build_type)
     self._running_on_emulator = self.device.startswith('emulator')
     self._test_arguments = test_arguments
     self.in_webkit_checkout = in_webkit_checkout
     self._cleanup_test_files = cleanup_test_files
 
     logging.warning('Test suite: ' + test_suite)
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = test_package_apk.TestPackageApk(
           self.adb,
           device,
           test_suite,
           timeout,
           self._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.
       symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type,
                                  'lib.target')
       self.test_package = test_package_executable.TestPackageExecutable(
           self.adb,
           device,
           test_suite,
           timeout,
@@ skipping 91 matching lines @@
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()