Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc |
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc |
index efb1153926a41c1af9fe5ea5cbe1ca114f81a44c..ff772740e54a62794f8b8aa2d202693023073096 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc |
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc |
@@ -707,7 +707,13 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeProceed) { |
browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); |
} |
-IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, |
+// Disabled on Win Aura because it is flaky: crbug.com/273302. |
+#if defined(OS_WIN) && defined(USE_AURA) |
+#define MAYBE_SafeBrowsingBlockingPageTest DISABLED_SafeBrowsingBlockingPageTest |
+#else |
+#define MAYBE_SafeBrowsingBlockingPageTest SafeBrowsingBlockingPageTest |
+#endif |
+IN_PROC_BROWSER_TEST_F(MAYBE_SafeBrowsingBlockingPageTest, |
MalwareIframeReportDetails) { |
tapted
2013/08/15 02:14:45
I think the MAYBE_ should on this line ;)
ericu
2013/08/15 02:20:20
Doh!
|
GURL url = SetupMalwareIframeWarningAndNavigate(); |