Commit 62751cac authored by Xida Chen's avatar Xida Chen Committed by Commit Bot

Disable FlingControllerTest.ControllerBoostsTouchpadFling on Linux

TBR=wjmaclean@chromium.org
NOTRY=true

Bug: 874428
Change-Id: Ie5973dd0f214a53743f59a3bfb63553495eccfe6
Reviewed-on: https://chromium-review.googlesource.com/1175697
Commit-Queue: Xida Chen <xidachen@chromium.org>
Reviewed-by: default avatarXida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583229}
parent 86bd8cc6
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "content/browser/renderer_host/input/gesture_event_queue.h" #include "content/browser/renderer_host/input/gesture_event_queue.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/base_event_utils.h" #include "ui/events/base_event_utils.h"
...@@ -455,7 +456,13 @@ TEST_F(FlingControllerTest, DISABLED_GestureFlingWithNegativeTimeDelta) { ...@@ -455,7 +456,13 @@ TEST_F(FlingControllerTest, DISABLED_GestureFlingWithNegativeTimeDelta) {
EXPECT_GT(last_sent_gesture_.data.scroll_update.delta_x, 0.f); EXPECT_GT(last_sent_gesture_.data.scroll_update.delta_x, 0.f);
} }
TEST_F(FlingControllerTest, ControllerBoostsTouchpadFling) { #if defined(OS_LINUX)
#define MAYBE_ControllerBoostsTouchpadFling \
DISABLED_ControllerBoostsTouchpadFling
#else
#define MAYBE_ControllerBoostsTouchpadFling ControllerBoostsTouchpadFling
#endif
TEST_F(FlingControllerTest, MAYBE_ControllerBoostsTouchpadFling) {
base::TimeTicks progress_time = base::TimeTicks::Now(); base::TimeTicks progress_time = base::TimeTicks::Now();
SimulateFlingStart(blink::kWebGestureDeviceTouchpad, gfx::Vector2dF(1000, 0)); SimulateFlingStart(blink::kWebGestureDeviceTouchpad, gfx::Vector2dF(1000, 0));
EXPECT_TRUE(FlingInProgress()); EXPECT_TRUE(FlingInProgress());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment