Re-enable content_browsertests on main waterfall.

Disabled the two tests that are crashing on android.

TBR=jam
BUG=341142

Review URL: https://codereview.chromium.org/153503005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249358 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/gtest/filter/content_browsertests_disabled

@@ -115,12 +115,6 @@ IndexedDBBrowserTestWithCorruptLevelDB.DestroyTest
 
 BookmarkletTest.NonEmptyResult
 
-# http://crbug.com/248796
-ResourceFetcherTests.ResourceFetcher404
-ResourceFetcherTests.ResourceFetcherDeletedInCallback
-ResourceFetcherTests.ResourceFetcherTimeout
-ResourceFetcherTests.ResourceFetcherDownload
-
 # http://crbug.com/256238
 SignalTest.*
 

android/pylib/gtest/gtest_config.py

@@ -6,7 +6,6 @@
 
 # Add new suites here before upgrading them to the stable list below.
 EXPERIMENTAL_TEST_SUITES = [
-    'content_browsertests',
     'content_gl_tests',
 ]
 
@@ -16,22 +15,23 @@ EXPERIMENTAL_TEST_SUITES = [
 STABLE_TEST_SUITES = [
     'android_webview_unittests',
     'base_unittests',
+    'breakpad_unittests',
     'cc_unittests',
     'components_unittests',
+    'content_browsertests',
     'content_unittests',
     'gl_tests',
     'gpu_unittests',
     'ipc_tests',
     'media_unittests',
     'net_unittests',
+    'sandbox_linux_unittests',
     'sql_unittests',
     'sync_unit_tests',
     'ui_unittests',
     'unit_tests',
     'webkit_compositor_bindings_unittests',
     'webkit_unit_tests',
-    'breakpad_unittests',
-    'sandbox_linux_unittests',
 ]
 
 WEBRTC_CHROMIUM_TEST_SUITES = [