BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 5 insertions, 9 deletions

diff --git a/chromium/content/browser/renderer_host/input/touch_action_browsertest.cc b/chromium/content/browser/renderer_host/input/touch_action_browsertest.cc
index b63e2f76487..d17be7a27c1 100644
--- a/chromium/content/browser/renderer_host/input/touch_action_browsertest.cc
+++ b/chromium/content/browser/renderer_host/input/touch_action_browsertest.cc
@@ -30,7 +30,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/latency_info.h"
 
@@ -165,7 +165,7 @@ class TouchActionBrowserTest : public ContentBrowserTest {
     // main thread was in a busy loop.
     while (wait_until_scrolled &&
            frame_watcher->LastMetadata().root_scroll_offset.y() <
-               distance.y()) {
+               (distance.y() / 2)) {
       frame_watcher->WaitFrames(1);
     }
 
@@ -175,7 +175,7 @@ class TouchActionBrowserTest : public ContentBrowserTest {
       return false;
 
     // Allow for 1px rounding inaccuracies for some screen sizes.
-    EXPECT_NEAR(distance.y(), scrollTop, 1);
+    EXPECT_LT(distance.y() / 2, scrollTop);
     return true;
   }
 
@@ -188,15 +188,11 @@ class TouchActionBrowserTest : public ContentBrowserTest {
 // Mac doesn't yet have a gesture recognizer, so can't support turning touch
 // events into scroll gestures.
 // Will be fixed with http://crbug.com/337142
-#if defined(OS_MACOSX)
-#define MAYBE_DefaultAuto DISABLED_DefaultAuto
-#else
-#define MAYBE_DefaultAuto DefaultAuto
-#endif
+// Flaky on all platforms: https://crbug.com/376668
 //
 // Verify the test infrastructure works - we can touch-scroll the page and get a
 // touchcancel as expected.
-IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, MAYBE_DefaultAuto) {
+IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, DISABLED_DefaultAuto) {
   LoadURL();
 
   bool scrolled = DoTouchScroll(gfx::Point(50, 50), gfx::Vector2d(0, 45), true);