[Android] Refactor the native test wrappers.

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 49263888c34aeb7f4b2816dedda6f3b32688d6fa..caff4c9b5b73cb49cc761a246aae821bfcfa76a9 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -11,6 +11,7 @@ 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
 
@@ -59,6 +60,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
     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: