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

ui/chromeos/touch_exploration_controller.cc

 // Copyright 2014 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 "ui/chromeos/touch_exploration_controller.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 670 matching lines @@
     ui::KeyEvent control_up(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, ui::EF_NONE);
 
     DispatchEvent(&control_down);
     DispatchEvent(&control_up);
     SET_STATE(NO_FINGERS_DOWN);
     return ui::EVENT_REWRITE_DISCARD;
   }
   return ui::EVENT_REWRITE_DISCARD;
 }
 
-base::TimeDelta TouchExplorationController::Now() {
+base::TimeTicks TouchExplorationController::Now() {
   if (tick_clock_) {
     // This is the same as what EventTimeForNow() does, but here we do it
     // with a clock that can be replaced with a simulated clock for tests.
-    return base::TimeDelta::FromInternalValue(
-        tick_clock_->NowTicks().ToInternalValue());
+    return tick_clock_->NowTicks();
   }
   return ui::EventTimeForNow();
 }
 
 void TouchExplorationController::StartTapTimer() {
   tap_timer_.Start(FROM_HERE,
                    gesture_detector_config_.double_tap_timeout,
                    this,
                    &TouchExplorationController::OnTapTimerFired);
 }
@@ skipping 305 matching lines @@
   // This is a short-term workaround for the limitation that we're using
   // the ChromeVox content script to process touch exploration events, but
   // ChromeVox needs a way to distinguish between a real mouse move and a
   // mouse move generated from touch exploration, so we have touch exploration
   // pretend that the command key was down (which becomes the "meta" key in
   // JavaScript). We can remove this hack when the ChromeVox content script
   // goes away and native accessibility code sends a touch exploration
   // event to the new ChromeVox background page via the automation api.
   flags |= ui::EF_COMMAND_DOWN;
 
-  std::unique_ptr<ui::MouseEvent> event(
-      new ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), flags, 0));
+  std::unique_ptr<ui::MouseEvent> event(new ui::MouseEvent(
+      ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), Now(), flags, 0));
   event->set_location_f(location);
   event->set_root_location_f(location);
   return event;
 }
 
 void TouchExplorationController::EnterTouchToMouseMode() {
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
   if (cursor_client && !cursor_client->IsMouseEventsEnabled())
     cursor_client->EnableMouseEvents();
@@ skipping 107 matching lines @@
       return "TWO_FINGER_TAP";
   }
   return "Not a state";
 }
 
 float TouchExplorationController::GetSplitTapTouchSlop() {
   return gesture_detector_config_.touch_slop * 3;
 }
 
 }  // namespace ui