Change ui::Event::time_stamp from TimeDelta to TimeTicks

ui/aura/gestures/gesture_recognizer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/test/simple_test_tick_clock.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 451 matching lines @@
 
  private:
   ui::GestureRecognizer* original_gr_;
   std::unique_ptr<ui::GestureRecognizer> new_gr_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedGestureRecognizerSetter);
 };
 
 class TimedEvents {
  private:
-  int simulated_now_;
+  base::SimpleTestTickClock tick_clock_;
 
  public:
   // Use a non-zero start time to pass DCHECKs which ensure events have had a
   // time assigned.
-  TimedEvents() : simulated_now_(1) {
+  TimedEvents() {
+    tick_clock_.Advance(base::TimeDelta::FromMilliseconds(1));
   }
 
-  base::TimeDelta Now() {
-    base::TimeDelta t = base::TimeDelta::FromMilliseconds(simulated_now_);
-    simulated_now_++;
+  base::TimeTicks Now() {
+    base::TimeTicks t = tick_clock_.NowTicks();
+    tick_clock_.Advance(base::TimeDelta::FromMilliseconds(1));
     return t;
   }
 
-  base::TimeDelta LeapForward(int time_in_millis) {
-    simulated_now_ += time_in_millis;
-    return base::TimeDelta::FromMilliseconds(simulated_now_);
+  base::TimeTicks LeapForward(int time_in_millis) {
+    tick_clock_.Advance(base::TimeDelta::FromMilliseconds(time_in_millis));
+    return tick_clock_.NowTicks();
   }
 
-  base::TimeDelta InFuture(int time_in_millis) {
-    return base::TimeDelta::FromMilliseconds(simulated_now_ + time_in_millis);
+  base::TimeTicks InFuture(int time_in_millis) {
+    return tick_clock_.NowTicks() +
+        base::TimeDelta::FromMilliseconds(time_in_millis);
   }
 
   void SendScrollEvents(ui::EventProcessor* dispatcher,
                         int x_start,
                         int y_start,
                         int dx,
                         int dy,
                         int touch_id,
-                        int time_step,
+                        int time_step_ms,
                         int num_steps,
                         GestureEventConsumeDelegate* delegate) {
     float x = x_start;
     float y = y_start;
 
     for (int i = 0; i < num_steps; i++) {
       x += dx;
       y += dy;
       ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(x, y), touch_id,
-                          base::TimeDelta::FromMilliseconds(simulated_now_));
+                          tick_clock_.NowTicks());
       ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move);
       ASSERT_FALSE(details.dispatcher_destroyed);
-      simulated_now_ += time_step;
+      tick_clock_.Advance(base::TimeDelta::FromMilliseconds(time_step_ms));
     }
   }
 
   void SendScrollEvent(ui::EventProcessor* dispatcher,
                        float x,
                        float y,
                        int touch_id,
                        GestureEventConsumeDelegate* delegate) {
     delegate->Reset();
     ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(), touch_id,
-                        base::TimeDelta::FromMilliseconds(simulated_now_));
+                        Now());
     move.set_location_f(gfx::PointF(x, y));
     move.set_root_location_f(gfx::PointF(x, y));
     ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
-    simulated_now_++;
   }
 };
 
 // An event handler to keep track of events.
 class TestEventHandler : public ui::EventHandler {
  public:
   TestEventHandler()
       : touch_released_count_(0),
         touch_pressed_count_(0),
         touch_moved_count_(0) {}
@@ skipping 3886 matching lines @@
   EXPECT_FALSE(queued_delegate2->long_press());
 
   queued_delegate->Reset();
   queued_delegate->WaitUntilReceivedGesture(ui::ET_GESTURE_SHOW_PRESS);
   EXPECT_TRUE(queued_delegate->show_press());
   EXPECT_FALSE(queued_delegate->tap_down());
 }
 
 }  // namespace test
 }  // namespace aura