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

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

Issue 250923005: Touch emulator: overwrite timestamps from mouse event with current time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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_emulator_unittest.cc
diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc
index 88ba25150009cb8200f160520702d71923f6f058..5337fca4bb296b067f4228cbe0e5501498b3eef7 100644
--- a/content/browser/renderer_host/input/touch_emulator_unittest.cc
+++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc
@@ -202,7 +202,7 @@ TEST_F(TouchEmulatorTest, Touch) {
MouseUp(200, 200);
EXPECT_EQ(
"TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate"
- " TouchEnd GestureScrollEnd",
+ " TouchEnd GestureFlingStart",
ExpectedEvents());
}
@@ -214,13 +214,13 @@ TEST_F(TouchEmulatorTest, MultipleTouches) {
MouseUp(200, 200);
EXPECT_EQ(
"TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate"
- " TouchEnd GestureScrollEnd",
+ " TouchEnd GestureFlingStart",
ExpectedEvents());
MouseMove(300, 200);
MouseMove(200, 200);
EXPECT_EQ("", ExpectedEvents());
MouseDown(300, 200);
- EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
+ EXPECT_EQ("TouchStart GestureFlingCancel GestureTapDown", ExpectedEvents());
MouseDrag(300, 300);
EXPECT_EQ(
"TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate",

Powered by Google App Engine
This is Rietveld 408576698