summaryrefslogtreecommitdiffstats
path: root/content/browser/web_contents
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/web_contents')
-rw-r--r--content/browser/web_contents/web_contents_view_aura_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index 111bf4e..e095827 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -365,13 +365,20 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
// Do not end the overscroll sequence.
}
+// Disable the test for windows as it keeps failing in XP bot, see
+// http://crbug/294116.
+#if defined(OS_WIN)
+#define MAYBE_OverscrollScreenshot DISABLED_OverscrollScreenshot
+#else
+#define MAYBE_OverscrollScreenshot OverscrollScreenshot
+#endif
// Tests that the page has has a screenshot when navigation happens:
// - from within the page (from a JS function)
// - interactively, when user does an overscroll gesture
// - interactively, when user navigates in history without the overscroll
// gesture.
IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
- OverscrollScreenshot) {
+ MAYBE_OverscrollScreenshot) {
ASSERT_NO_FATAL_FAILURE(
StartTestWithPage("files/overscroll_navigation.html"));
WebContentsImpl* web_contents =