diff options
| -rw-r--r-- | content/browser/renderer_host/input/touch_action_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index 46d693e..9c49ca2 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc @@ -189,9 +189,16 @@ IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, DISABLED_DefaultAuto) { } } +// TouchActionBrowserTest.TouchActionNone fails under ThreadSanitizer v2, +// see http://crbug.com/357505. +#if defined(THREAD_SANITIZER) +#define MAYBE_TouchActionNone DISABLED_TouchActionNone +#else +#define MAYBE_TouchActionNone TouchActionNone +#endif // Verify that touching a touch-action: none region disables scrolling and // enables all touch events to be sent. -IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, TouchActionNone) { +IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, MAYBE_TouchActionNone) { LoadURL(); bool scrolled = DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45)); |