diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 18:21:41 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 18:21:41 +0000 |
| commit | c63780b727b98367f944cf78a723f1dd2f9dea5b (patch) | |
| tree | 2931809cc18d67efd85aa6da5fa05a1e492441b5 /content | |
| parent | 433c9b2e9d9d42084707c342dac0b8885fba36ad (diff) | |
| download | chromium_src-c63780b727b98367f944cf78a723f1dd2f9dea5b.zip chromium_src-c63780b727b98367f944cf78a723f1dd2f9dea5b.tar.gz chromium_src-c63780b727b98367f944cf78a723f1dd2f9dea5b.tar.bz2 | |
Disable flaky WebContentsViewAuraTest.OverscrollNavigation[WithTouchHandler] on Win.
BUG=305722
TEST=NONE
R=mek@chromium.org, sadrul@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/26727002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura_browsertest.cc | 19 |
1 files changed, 16 insertions, 3 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 884d4ac..7b06029 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -277,13 +277,26 @@ class WebContentsViewAuraTest : public ContentBrowserTest { DISALLOW_COPY_AND_ASSIGN(WebContentsViewAuraTest); }; -IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, - OverscrollNavigation) { +// Flaky on Windows (perhaps just Win-Aura): http://crbug.com/305722 +#if defined(OS_WIN) +#define MAYBE_OverscrollNavigation DISABLED_OverscrollNavigation +#else +#define MAYBE_OverscrollNavigation OverscrollNavigation +#endif +IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_OverscrollNavigation) { TestOverscrollNavigation(false); } +// Flaky on Windows (perhaps just Win-Aura): http://crbug.com/305722 +#if defined(OS_WIN) +#define MAYBE_OverscrollNavigationWithTouchHandler \ + DISABLED_OverscrollNavigationWithTouchHandler +#else +#define MAYBE_OverscrollNavigationWithTouchHandler \ + OverscrollNavigationWithTouchHandler +#endif IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, - OverscrollNavigationWithTouchHandler) { + MAYBE_OverscrollNavigationWithTouchHandler) { TestOverscrollNavigation(true); } |