Re-enable content_browsertests on main waterfall.

content/renderer/resource_fetcher_browsertest.cc

 // 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.
 
 #include "content/public/renderer/resource_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 313 matching lines @@
   // timeout in 0 sec.
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("slow?1"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherDeletedInCallbackOnRenderer,
             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));
 
   // Grab a page that echos the POST body.
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("echo"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherPost,
             base::Unretained(this), url));
 }
 
 // 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));
 
   // Grab a page that echos the POST body.
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("echoheader?header"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherSetHeader,
             base::Unretained(this), url));
 }
 
 }  // namespace content