Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: content/browser/renderer_host/input/touch_action_browsertest.cc

Issue 886563005: Remove touch-scrolling-mode flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/touch_action_browsertest.cc
diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc
index ea4649eeb016d30cef347d66408e2ccaa4bba20f..38718b3f8c0beff45b481a6398f71f0604d45896 100644
--- a/content/browser/renderer_host/input/touch_action_browsertest.cc
+++ b/content/browser/renderer_host/input/touch_action_browsertest.cc
@@ -179,14 +179,8 @@ IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, DISABLED_DefaultAuto) {
EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart"));
EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchmove"));
- if (TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT ==
- TouchEventQueue::TOUCH_SCROLLING_MODE_TOUCHCANCEL) {
- EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchend"));
- EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
- } else {
- EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend"));
- EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
- }
+ EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend"));
+ EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
}
// Verify that touching a touch-action: none region disables scrolling and

Powered by Google App Engine
This is Rietveld 408576698