MacViews: Modify cocoa_test_event_utils::SynthesizeKeyEvent to use the correct event timestamp value

ui/events/test/cocoa_test_event_utils.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.

[tapted, 2016/06/28 05:07:41]

CL description nit: start a new paragraph for "This CL fixes..". And break it up
a bit. I think there's a type or two as well E.g.

This CL fixes the tests by using a timestamp value obtained from
ui::EventTimeForNow. This returns the mocked time (if applicable), or
base::TimeTicks::Now(). base::TimeTicks::Now() internally uses the same logic as
TimeIntervalSinceSystemStartup() did previously (i.e. mach_absolute_time())

[karandeepb, 2016/06/28 12:07:49]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
-#include <mach/mach_time.h>
 #include <stdint.h>
 
+#include "base/time/time.h"
+#include "ui/events/base_event_utils.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/events/test/cocoa_test_event_utils.h"

[tapted, 2016/06/28 05:07:41]

nit (while you're here), this should be before <Cocoa/Cocoa.h>, and #imported

[karandeepb, 2016/06/28 12:07:49]

Done.

 
 namespace cocoa_test_event_utils {
 
-namespace {
-
-// From
-// http://stackoverflow.com/questions/1597383/cgeventtimestamp-to-nsdate
-// Which credits Apple sample code for this routine.
-uint64_t UpTimeInNanoseconds(void) {
-  uint64_t time;
-  uint64_t timeNano;
-  static mach_timebase_info_data_t sTimebaseInfo;
-
-  time = mach_absolute_time();
-
-  // Convert to nanoseconds.
-
-  // If this is the first time we've run, get the timebase.
-  // We can use denom == 0 to indicate that sTimebaseInfo is
-  // uninitialised because it makes no sense to have a zero
-  // denominator is a fraction.
-  if (sTimebaseInfo.denom == 0) {
-    (void) mach_timebase_info(&sTimebaseInfo);
-  }
-
-  // This could overflow; for testing needs we probably don't care.
-  timeNano = time * sTimebaseInfo.numer / sTimebaseInfo.denom;
-  return timeNano;
-}
-
-}  // namespace
-
 NSEvent* MouseEventAtPoint(NSPoint point, NSEventType type,
                            NSUInteger modifiers) {
   if (type == NSOtherMouseUp) {
     // To synthesize middle clicks we need to create a CGEvent with the
     // "center" button flags so that our resulting NSEvent will have the
     // appropriate buttonNumber field. NSEvent provides no way to create a
     // mouse event with a buttonNumber directly.
     CGPoint location = { point.x, point.y };
     CGEventRef cg_event = CGEventCreateMouseEvent(NULL, kCGEventOtherMouseUp,
                                                   location,
                                                   kCGMouseButtonCenter);
     // Also specify the modifiers for the middle click case. This makes this
     // test resilient to external modifiers being pressed.
     CGEventSetFlags(cg_event, static_cast<CGEventFlags>(modifiers));
     NSEvent* event = [NSEvent eventWithCGEvent:cg_event];
     CFRelease(cg_event);
     return event;
   }
   return [NSEvent mouseEventWithType:type
                             location:point
                        modifierFlags:modifiers
-                           timestamp:0
+                           timestamp:TimeIntervalSinceSystemStartup()
                         windowNumber:0
                              context:nil
                          eventNumber:0
                           clickCount:1
                             pressure:1.0];
 }
 
 NSEvent* MouseEventWithType(NSEventType type, NSUInteger modifiers) {
   return MouseEventAtPoint(NSZeroPoint, type, modifiers);
 }
 
 NSEvent* MouseEventAtPointInWindow(NSPoint point,
                                    NSEventType type,
                                    NSWindow* window,
                                    NSUInteger clickCount) {
   return [NSEvent mouseEventWithType:type
                             location:point
                        modifierFlags:0
-                           timestamp:0
+                           timestamp:TimeIntervalSinceSystemStartup()
                         windowNumber:[window windowNumber]
                              context:nil
                          eventNumber:0
                           clickCount:clickCount
                             pressure:1.0];
 }
 
 NSEvent* RightMouseDownAtPointInWindow(NSPoint point, NSWindow* window) {
   return MouseEventAtPointInWindow(point, NSRightMouseDown, window, 1);
 }
@@ skipping 41 matching lines @@
 }
 
 NSEvent* KeyEventWithKeyCode(unsigned short key_code,
                              unichar c,
                              NSEventType event_type,
                              NSUInteger modifiers) {
   NSString* chars = [NSString stringWithCharacters:&c length:1];
   return [NSEvent keyEventWithType:event_type
                           location:NSZeroPoint
                      modifierFlags:modifiers
-                         timestamp:0
+                         timestamp:TimeIntervalSinceSystemStartup()
                       windowNumber:0
                            context:nil
                         characters:chars
        charactersIgnoringModifiers:chars
                          isARepeat:NO
                            keyCode:key_code];
 }
 
 static NSEvent* EnterExitEventWithType(NSEventType event_type) {
   return [NSEvent enterExitEventWithType:event_type
                                 location:NSZeroPoint
                            modifierFlags:0
-                               timestamp:0
+                               timestamp:TimeIntervalSinceSystemStartup()
                             windowNumber:0
                                  context:nil
                              eventNumber:0
                           trackingNumber:0
                                 userData:NULL];
 }
 
 NSEvent* EnterEvent() {
   return EnterExitEventWithType(NSMouseEntered);
 }
 
 NSEvent* ExitEvent() {
   return EnterExitEventWithType(NSMouseExited);
 }
 
 NSEvent* OtherEventWithType(NSEventType event_type) {
   return [NSEvent otherEventWithType:event_type
                             location:NSZeroPoint
                        modifierFlags:0
-                           timestamp:0
+                           timestamp:TimeIntervalSinceSystemStartup()
                         windowNumber:0
                              context:nil
                              subtype:0
                                data1:0
                                data2:0];
 }
 
 NSTimeInterval TimeIntervalSinceSystemStartup() {
-  return UpTimeInNanoseconds() / 1000000000.0;
+  base::TimeDelta time_elapsed = ui::EventTimeForNow() - base::TimeTicks();
+  return time_elapsed.InSeconds();

[tapted, 2016/06/28 05:07:41]

InSeconds -> InSecondsF

[karandeepb, 2016/06/28 12:07:49]

Done.

 }
 
 NSEvent* SynthesizeKeyEvent(NSWindow* window,
                             bool keyDown,
                             ui::KeyboardCode keycode,
                             NSUInteger flags,
                             ui::DomKey dom_key) {
   // If caps lock is set for an alpha keycode, treat it as if shift was pressed.
   // Note on Mac (unlike other platforms) shift while caps is down does not go
   // back to lowercase.
@@ skipping 64 matching lines @@
                                      context:nil
                                   characters:characters
                  charactersIgnoringModifiers:charactersIgnoringModifiers
                                    isARepeat:NO
                                      keyCode:(unsigned short)macKeycode];
 
   return event;
 }
 
 }  // namespace cocoa_test_event_utils