Validate that ui::Event::time_stamp comes from the same clock as TimeTicks::Now

ui/events/test/event_generator.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/events/test/event_generator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 581 matching lines @@
   DispatchKeyEvent(false, key_code, flags);
 }
 
 void EventGenerator::Dispatch(ui::Event* event) {
   DoDispatchEvent(event, async_);
 }
 
 void EventGenerator::SetTickClock(std::unique_ptr<base::TickClock> tick_clock) {
   scoped_refptr<ClonableTickClock> clonable =
       new ClonableTickClock(std::move(tick_clock));
-#if defined(USE_X11)
-  ResetTimestampRolloverCountersForTesting(clonable->Clone());
-#endif
+  ui::SetEventTickClockForTesting(clonable->Clone());
   tick_clock_ = clonable->Clone();
 }
 
 base::TimeTicks EventGenerator::Now() {
   // This is the same as what EventTimeForNow() does, but here we do it
   // with a tick clock that can be replaced with a simulated clock for tests.
+  // TODO(majidvp): The tick clock used by |ui::EventTimeForNow()| is now
+  // mockable so we no longer need this.

[sadrul, 2016/06/23 16:38:37]

So SetTickClick() and Now() from EventGenerator can go?

[majidvp, 2016/06/24 19:40:56]

Yes. I think we can replace them with ui::SetEventTickClockForTesting and
ui::EventTimeForNow.
I will have a follow up patch that does that.

   return tick_clock_->NowTicks();
 }
 
 void EventGenerator::Init(gfx::NativeWindow root_window,
                           gfx::NativeWindow window_context) {
   SetTickClock(WrapUnique(new TestTickClock()));
   delegate()->SetContext(this, root_window, window_context);
   if (window_context)
     current_location_ = delegate()->CenterOfWindow(window_context);
   current_target_ = delegate()->GetTargetAt(current_location_);
@@ skipping 115 matching lines @@
   return default_delegate;
 }
 
 EventGeneratorDelegate* EventGenerator::delegate() {
   return const_cast<EventGeneratorDelegate*>(
       const_cast<const EventGenerator*>(this)->delegate());
 }
 
 }  // namespace test
 }  // namespace ui