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

chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.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 "ash/common/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
@@ skipping 45 matching lines @@
     root_window_->RemovePreTargetHandler(event_handler_.get());
   }
 
   void SwitchTouchExplorationMode(bool on) {
     ash::AccessibilityDelegate* ad =
         ash::Shell::GetInstance()->accessibility_delegate();
     if (on != ad->IsSpokenFeedbackEnabled())
       ad->ToggleSpokenFeedback(ui::A11Y_NOTIFICATION_NONE);
   }
 
-  base::TimeDelta Now() {
-    return base::TimeDelta::FromInternalValue(
-        simulated_clock_->NowTicks().ToInternalValue());
-  }
+  base::TimeTicks Now() { return simulated_clock_->NowTicks(); }
 
   ui::GestureDetector::Config gesture_detector_config_;
   base::SimpleTestTickClock* simulated_clock_;
   aura::Window* root_window_;
   std::unique_ptr<ui::test::TestEventHandler> event_handler_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationTest);
 };
 
 #if defined(OS_CHROMEOS)
 // crbug.com/422943
 #define MAYBE_NoRewritingEventsWhenOff DISABLED_NoRewritingEventsWhenOff
 #else
 #define MAYBE_NoRewritingEventsWhenOff NoRewritingEventsWhenOff
 #endif
 
 // This test turns the touch exploration mode off and confirms that events
 // aren't modified.
 IN_PROC_BROWSER_TEST_F(TouchExplorationTest, MAYBE_NoRewritingEventsWhenOff) {
   SwitchTouchExplorationMode(false);
   ui::test::EventGenerator generator(root_window_);
 
-  base::TimeDelta initial_time = Now();
+  base::TimeTicks initial_time = Now();
   ui::TouchEvent initial_press(
       ui::ET_TOUCH_PRESSED, gfx::Point(99, 200), 1, initial_time);
   generator.Dispatch(&initial_press);
 
   // Since the touch exploration controller doesn't know if the user is
   // double-tapping or not, touch exploration is only initiated if the
   // 300 ms has elapsed and the finger does not move fast enough to begin
   // gestures. Here, the touch move event is not important as a move, but
   // a way to create time advancement.
   ui::TouchEvent touch_time_advance(ui::ET_TOUCH_MOVED,
@@ skipping 28 matching lines @@
   EXPECT_EQ(2, event_handler_->num_touch_events());
 }
 
 // This test turns the touch exploration mode on and confirms that events get
 // rewritten.
 // Disabling due to failing over 10% of the time. (crbug.com/469119)
 IN_PROC_BROWSER_TEST_F(TouchExplorationTest, DISABLED_RewritesEventsWhenOn) {
   SwitchTouchExplorationMode(true);
   ui::test::EventGenerator generator(root_window_);
 
-  base::TimeDelta initial_time = Now();
+  base::TimeTicks initial_time = Now();
   ui::TouchEvent initial_press(
       ui::ET_TOUCH_PRESSED, gfx::Point(100, 200), 1, initial_time);
   generator.Dispatch(&initial_press);
 
   // Since the touch exploration controller doesn't know if the user is
   // double-tapping or not, touch exploration is only initiated if the
   // 300 ms has elapsed and the finger does not move fast enough to begin
   // gestures. Here, the touch move event is not important as a move, but
   // a way to create time advancement.
   ui::TouchEvent touch_time_advance(ui::ET_TOUCH_MOVED,
@@ skipping 49 matching lines @@
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window_);
 
   // Mouse events should show the cursor.
   generator.MoveMouseTo(gfx::Point(30, 31));
   EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
   EXPECT_TRUE(cursor_client->IsCursorVisible());
 
   // The cursor should be shown immediately after the  press, and hidden
   // after the move.
-  base::TimeDelta initial_time = Now();
+  base::TimeTicks initial_time = Now();
   ui::TouchEvent initial_press(
       ui::ET_TOUCH_PRESSED, gfx::Point(100, 200), 1, initial_time);
   generator.Dispatch(&initial_press);
   EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
   EXPECT_TRUE(cursor_client->IsCursorVisible());
 
   // Initiate touch explore by waiting for the tap timer timeout. Time is
   // advanced by sending a move event after the timeout period.
   ui::TouchEvent touch_time_advance(
       ui::ET_TOUCH_MOVED,
@@ skipping 22 matching lines @@
 
   // Continuing to move the touch exploration finger should send more mouse
   // events.
   generator.MoveTouchId(gfx::Point(509, 609), 1);
   EXPECT_EQ(0, event_handler_->num_touch_events());
   EXPECT_TRUE(cursor_client->IsMouseEventsEnabled());
   EXPECT_FALSE(cursor_client->IsCursorVisible());
 }
 
 }  // namespace ui