[Android] Dedup content_browsertests test setup from gtests.

build/android/pylib/gtest/gtest_config.py

Index: build/android/pylib/gtest/gtest_config.py
diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py
index 892b9df3d2144d9b989e0d1f41f618b058a19de6..d74c0329633cda4940712b7aba8374cc7eb17688 100644
--- a/build/android/pylib/gtest/gtest_config.py
+++ b/build/android/pylib/gtest/gtest_config.py
@@ -4,37 +4,30 @@
 
 """Configuration file for android gtest suites."""
 
-import collections
-
-
-Suite = collections.namedtuple('Suite', ['is_suite_exe', 'name'])
-Exe = lambda name : Suite(True, name)
-Apk = lambda name : Suite(False, name)
-
-
 # Add new suites here before upgrading them to the stable list below.
 EXPERIMENTAL_TEST_SUITES = [
+    'content_browsertests',
 ]
 
 # Do not modify this list without approval of an android owner.
 # This list determines which suites are run by default, both for local
 # testing and on android trybots running on commit-queue.
 STABLE_TEST_SUITES = [
-    Apk('android_webview_unittests'),
-    Apk('base_unittests'),
-    Apk('cc_unittests'),
-    Apk('components_unittests'),
-    Apk('content_unittests'),
-    Apk('gpu_unittests'),
-    Apk('ipc_tests'),
-    Apk('media_unittests'),
-    Apk('net_unittests'),
-    Apk('sql_unittests'),
-    Apk('sync_unit_tests'),
-    Apk('ui_unittests'),
-    Apk('unit_tests'),
-    Apk('webkit_compositor_bindings_unittests'),
-    Apk('webkit_unit_tests'),
-    Exe('breakpad_unittests'),
-    Exe('sandbox_linux_unittests'),
+    'android_webview_unittests',
+    'base_unittests',
+    'cc_unittests',
+    'components_unittests',
+    'content_unittests',
+    'gpu_unittests',
+    'ipc_tests',
+    'media_unittests',
+    'net_unittests',
+    'sql_unittests',
+    'sync_unit_tests',
+    'ui_unittests',
+    'unit_tests',
+    'webkit_compositor_bindings_unittests',
+    'webkit_unit_tests',
+    'breakpad_unittests',
+    'sandbox_linux_unittests',
 ]