[Android] Refactor the native test wrappers.

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 logging
 import os
 import re
 
 from pylib import pexpect
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
+from pylib.gtest import gtest_test_instance
 from pylib.local import local_test_server_spawner
 from pylib.perf import perf_control
 
 # Test case statuses.
 RE_RUN = re.compile('\\[ RUN      \\] ?(.*)\r\n')
 RE_FAIL = re.compile('\\[  FAILED  \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
 RE_OK = re.compile('\\[       OK \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
 
 # Test run statuses.
 RE_PASSED = re.compile('\\[  PASSED  \\] ?(.*)\r\n')
@@ skipping 28 matching lines @@
       test_options: A GTestOptions object.
       device: Device to run the tests.
       test_package: An instance of TestPackage class.
     """
 
     super(TestRunner, self).__init__(device, test_options.tool)
 
     self.test_package = test_package
     self.test_package.tool = self.tool
     self._test_arguments = test_options.test_arguments
+    if self.test_package.suite_name in gtest_test_instance.BROWSER_TEST_SUITES:
+      self._test_arguments += (
+          ' ' + ' '.join(gtest_test_instance.BROWSER_TEST_FLAGS))
 
     timeout = test_options.timeout
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
 
     self._timeout = min(timeout * self.tool.GetTimeoutScale(),
                         _INFRA_STDOUT_TIMEOUT)
@@ skipping 120 matching lines @@
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     for s in self._servers:
       s.TearDown()
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()