Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5058)

Unified Diff: chrome/browser/errorpage_browsertest.cc

Issue 14932003: Disable ErrorPageTest.DNSError_GoBack* and DNSError_Basic on Win and Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/errorpage_browsertest.cc
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index d87b5ac9137af10d024fcc58ee9ebad7cfa55d02..8ca91ffd620bca8159be7fe46d97235bc14745a5 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -117,7 +117,7 @@ class ErrorPageTest : public InProcessBrowserTest {
};
// See crbug.com/109669
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_DNSError_Basic DISABLED_DNSError_Basic
#else
#define MAYBE_DNSError_Basic DNSError_Basic
@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_Basic) {
}
// See crbug.com/109669
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_DNSError_GoBack1 DISABLED_DNSError_GoBack1
#else
#define MAYBE_DNSError_GoBack1 DNSError_GoBack1
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack1) {
}
// See crbug.com/109669
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_DNSError_GoBack2 DISABLED_DNSError_GoBack2
#else
#define MAYBE_DNSError_GoBack2 DNSError_GoBack2
@@ -163,7 +163,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2) {
}
// See crbug.com/109669
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_DNSError_GoBack2AndForward DISABLED_DNSError_GoBack2AndForward
#else
#define MAYBE_DNSError_GoBack2AndForward DNSError_GoBack2AndForward
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2AndForward) {
}
// See crbug.com/109669
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_DNSError_GoBack2Forward2 DISABLED_DNSError_GoBack2Forward2
#else
#define MAYBE_DNSError_GoBack2Forward2 DNSError_GoBack2Forward2
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698