Disabled the tests for windows since it keep failing the XP bot.

TBR=machenbach@chromium.org

BUG=294116

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223855 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 4 deletions

diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 9adc504..515a32e 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -338,10 +338,17 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
 // implementation.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 
+// Disable the test for windows as it keeps failing in XP bot, see
+// http://crbug/294116.
+#if defined(OS_WIN)
+#define MAYBE_CopyFromBackingStore DISABLED_CopyFromBackingStore
+#else
+#define MAYBE_CopyFromBackingStore CopyFromBackingStore
+#endif
 // The CopyFromBackingStore() API should work on all platforms when compositing
 // is enabled.
 IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,
-                       CopyFromBackingStore) {
+                       MAYBE_CopyFromBackingStore) {
   RunBasicCopyFromBackingStoreTest();
 }
 
@@ -417,10 +424,17 @@ IN_PROC_BROWSER_TEST_F(NonCompositingRenderWidgetHostViewBrowserTest,
   EXPECT_FALSE(GetRenderWidgetHostViewPort()->CanCopyToVideoFrame());
 }
 
+// Disable the test for windows as it keeps failing in XP bot, see
+// http://crbug/294116.
+#if defined(OS_WIN)
+#define MAYBE_FrameSubscriberTest DISABLED_FrameSubscriberTest
+#else
+#define MAYBE_FrameSubscriberTest FrameSubscriberTest
+#endif
 // Test basic frame subscription functionality.  We subscribe, and then run
 // until at least one DeliverFrameCallback has been invoked.
 IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,
-                       FrameSubscriberTest) {
+                      MAYBE_FrameSubscriberTest) {
   SET_UP_SURFACE_OR_PASS_TEST(NULL);
   RenderWidgetHostViewPort* const view = GetRenderWidgetHostViewPort();
   if (!view->CanSubscribeFrame()) {
@@ -444,8 +458,16 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,
   EXPECT_LE(1, frames_captured());
 }
 
+// Disable the test for windows as it keeps failing in XP bot, see
+// http://crbug/294116.
+#if defined(OS_WIN)
+#define MAYBE_CopyTwice DISABLED_CopyTwice
+#else
+#define MAYBE_CopyTwice CopyTwice
+#endif
 // Test that we can copy twice from an accelerated composited page.
-IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest, CopyTwice) {
+IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,
+                       MAYBE_CopyTwice) {
   SET_UP_SURFACE_OR_PASS_TEST(NULL);
   RenderWidgetHostViewPort* const view = GetRenderWidgetHostViewPort();
   if (!view->CanCopyToVideoFrame()) {
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 =