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

Unified Diff: ash/test/ash_test_base.cc

Issue 968873005: Touch Feedback tests on Valgrind (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 93b4b986929aa9012f9fe60effa11573e28140e6..2aada0f4c3e8120b13d4a0d61832e5c23a9babf8 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -134,9 +134,14 @@ void AshTestBase::SetUp() {
Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
- // Changing GestureConfiguration shouldn't make tests fail.
- ui::GestureConfiguration::GetInstance()
- ->set_max_touch_move_in_pixels_for_click(5);
+ // Changing GestureConfiguration shouldn't make tests fail. These values
+ // prevent unexpected events from being generated during tests. Such as
+ // delayed events which create race conditions on slower tests.
+ ui::GestureConfiguration* gesture_config =
+ ui::GestureConfiguration::GetInstance();
+ gesture_config->set_max_touch_down_duration_for_click_in_ms(800);
+ gesture_config->set_long_press_time_in_ms(1000);
+ gesture_config->set_max_touch_move_in_pixels_for_click(5);
#if defined(OS_WIN)
if (!command_line->HasSwitch(ash::switches::kForceAshToDesktop)) {

Powered by Google App Engine
This is Rietveld 408576698