Re-enable content_browsertests on main waterfall.

content/renderer/resource_fetcher_browsertest.cc

Index: content/renderer/resource_fetcher_browsertest.cc
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc
index 5457fe970f77b5d8dbd2142d0839df354be21d4e..9219330b7f236795bc2faa935731e3e2cf4e726e 100644
--- a/content/renderer/resource_fetcher_browsertest.cc
+++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -331,8 +331,18 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDeletedInCallback) {
             base::Unretained(this), url));
 }
 
+
+#if defined(OS_ANDROID)
+// disable these two tests on android to enable content_browsertest

[Paweł Hajdan Jr., 2014/02/05 22:42:41]

Please reference the bug (http://crbug.com/...).

Also, start the comment with a capital letter and end with a dot.

It's actually fine to just say // Disabled (http://crbug.com/...).

+#define MAYBE_ResourceFetcherPost DISABLED_ResourceFetcherPost
+#define MAYBE_ResourceFetcherSetHeader DISABLED_ResourceFetcherSetHeader
+#else
+#define MAYBE_ResourceFetcherPost ResourceFetcherPost
+#define MAYBE_ResourceFetcherSetHeader ResourceFetcherSetHeader
+#endif
+
 // Test that ResourceFetchers can handle POSTs.
-IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherPost) {
+IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherPost) {
   // Need to spin up the renderer.
   NavigateToURL(shell(), GURL(kAboutBlankURL));
 
@@ -347,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherPost) {
 }
 
 // Test that ResourceFetchers can set headers.
-IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherSetHeader) {
+IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherSetHeader) {
   // Need to spin up the renderer.
   NavigateToURL(shell(), GURL(kAboutBlankURL));