Using ui::test::EventGenerator

ui/views/test/event_generator_delegate_mac.mm

Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 44e08a5adaea5aabfe0ef6f305d7098f3ea99b28..06d7b144b892227d29f29289cbd7b26f451dd812 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -36,13 +36,9 @@ namespace {
 
 NSPoint ConvertRootPointToTarget(NSWindow* target,
                                  const gfx::Point& point_in_root) {
-  // Normally this would do ui::ConvertPointFromScreenToWindow. However, Cocoa
-  // can reposition the window on screen and make things flaky. Initially, just
-  // assume that the contentRect of |target| is at the top-left corner of the
-  // screen.
-  NSRect content_rect = [target contentRectForFrameRect:[target frame]];
-  return NSMakePoint(point_in_root.x(),
-                     NSHeight(content_rect) - point_in_root.y());
+  // For Mac, assume the root window equates to the primary screen.
+  return ui::ConvertPointFromScreenToWindow(
+      target, gfx::ScreenPointToNSPoint(point_in_root));
 }
 
 // Inverse of ui::EventFlagsFromModifiers().
@@ -349,10 +345,8 @@ EventGeneratorDelegateMac::GetChildIterator() const {
 }
 
 void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
-  NSEvent* ns_event = CreateMouseEventInWindow(window_,
-                                               event->type(),
-                                               event->location(),
-                                               event->changed_button_flags());
+  NSEvent* ns_event = CreateMouseEventInWindow(
+      window_, event->type(), event->location(), event->flags());
   if (owner_->targeting_application())
     [NSApp sendEvent:ns_event];
   else