From 13a1ded9fbe3126dbcd7f62ae86bf6817e563b85 Mon Sep 17 00:00:00 2001
From: benwells <benwells@chromium.org>
Date: Mon, 3 Nov 2014 19:41:29 -0800
Subject: [PATCH] Disabled two cross site ResourceDispatcherHostBrowserTests
 everywhere.

These were disabled on Mac, but are flaking everywhere.

TBR=mmenke
BUG=130404
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#302568}
---
 .../loader/resource_dispatcher_host_browsertest.cc     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index 68c182370f75..8673c07b086b 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -223,15 +223,10 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
   ASSERT_FALSE(got_downloads());
 }
 
-// Flaky on mac bots. crbug.com/429190
-#if defined(OS_MACOSX)
-#define MAYBE_CrossSiteOnunloadCookie DISABLED_CrossSiteOnunloadCookie
-#else
-#define MAYBE_CrossSiteOnunloadCookie CrossSiteOnunloadCookie
-#endif
+// Flaky everywhere. http://crbug.com/130404
 // Tests that onunload is run for cross-site requests.  (Bug 1114994)
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
-                       MAYBE_CrossSiteOnunloadCookie) {
+                       DISABLED_CrossSiteOnunloadCookie) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url = embedded_test_server()->GetURL("/onunload_cookie.html");
@@ -343,17 +338,12 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
   CheckTitleTest(url, "Title Of Awesomeness");
 }
 
-// Flaky on mac bots. crbug.com/429190
-#if defined(OS_MACOSX)
-#define MAYBE_CrossSiteNavigationErrorPage DISABLED_CrossSiteNavigationErrorPage
-#else
-#define MAYBE_CrossSiteNavigationErrorPage CrossSiteNavigationErrorPage
-#endif
+// Flaky everywhere. http://crbug.com/130404
 // Tests that a cross-site navigation to an error page (resulting in the link
 // doctor page) still runs the onunload handler and can support navigations
 // away from the link doctor page.  (Bug 1235537)
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
-                       MAYBE_CrossSiteNavigationErrorPage) {
+                       DISABLED_CrossSiteNavigationErrorPage) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/onunload_cookie.html"));
-- 
2.11.4.GIT