chrome/browser/errorpage_browsertest.cc - Issue 26622003: linux_aura: Turn it on again.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/errorpage_browsertest.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/errorpage_browsertest.cc

diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc

index 15a1590863f8612efea2aa1faf827ce794f1f5a7..aa90a22c8645a7cb9f7ad66862c3e6f81d1d1a22 100644

--- a/chrome/browser/errorpage_browsertest.cc

+++ b/chrome/browser/errorpage_browsertest.cc

@@ -262,7 +262,9 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_IFrameDNSError_GoBack) {

}

// This test fails regularly on win_rel trybots. See crbug.com/121540

-#if defined(OS_WIN)

+//

+// This fails on linux_aura bringup: http://crbug.com/163931

+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))

#define MAYBE_IFrameDNSError_GoBackAndForward DISABLED_IFrameDNSError_GoBackAndForward

#else

#define MAYBE_IFrameDNSError_GoBackAndForward IFrameDNSError_GoBackAndForward