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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

Issue 306483003: Prepare for Unified Gesture Recognizer landing in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix non-monotonic timestamps Created 6 years, 7 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: chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
index dd46f88f8f943c36b4875b672f52e223d20c04cf..10e6d36cda0cc07c02d2fdabe7524340a89cc6b3 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -24,6 +24,7 @@
#include "ui/base/test/ui_controls.h"
#include "ui/base/ui_base_switches.h"
#include "ui/events/event_processor.h"
+#include "ui/events/event_utils.h"
#include "ui/views/controls/textfield/textfield_test_api.h"
class OmniboxViewViewsTest : public InProcessBrowserTest {
@@ -80,13 +81,22 @@ class OmniboxViewViewsTest : public InProcessBrowserTest {
ui::EventProcessor* dispatcher =
browser()->window()->GetNativeWindow()->GetHost()->event_processor();
- ui::TouchEvent press(ui::ET_TOUCH_PRESSED, press_location,
- 5, base::TimeDelta::FromMilliseconds(0));
+ base::TimeDelta timestamp = ui::EventTimeForNow();
+ ui::TouchEvent press(
+ ui::ET_TOUCH_PRESSED, press_location, 5, timestamp);
ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
ASSERT_FALSE(details.dispatcher_destroyed);
- ui::TouchEvent release(ui::ET_TOUCH_RELEASED, release_location,
- 5, base::TimeDelta::FromMilliseconds(50));
+ if (press_location != release_location) {
+ timestamp += base::TimeDelta::FromMilliseconds(10);
+ ui::TouchEvent move(
+ ui::ET_TOUCH_MOVED, release_location, 5, timestamp);
+ details = dispatcher->OnEventFromSource(&move);
+ }
+
+ timestamp += base::TimeDelta::FromMilliseconds(50);
+ ui::TouchEvent release(
+ ui::ET_TOUCH_RELEASED, release_location, 5, timestamp);
details = dispatcher->OnEventFromSource(&release);
ASSERT_FALSE(details.dispatcher_destroyed);
}

Powered by Google App Engine
This is Rietveld 408576698