MacViews: Send Mac scrollWheel NSEvents as ui::ET_SCROLL (ui::ScrollEvent).

content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm

 // Copyright 2015 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 "content/browser/renderer_host/input/web_input_event_builders_mac.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 558 matching lines @@
 
   const NSEventType kEventTypeToTest[] = {NSKeyDown, NSKeyUp};
   for (auto flags : kEventTypeToTest) {
     NSEvent* mac_event = BuildFakeKeyEvent(kVK_ContextMenu, 0, 0, flags);
     WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
     EXPECT_EQ(ui::DomKey::CONTEXT_MENU, web_event.domKey);
     EXPECT_EQ(ui::VKEY_APPS, web_event.windowsKeyCode);
   }
 }
 
-// Flaky - https://crbug.com/640457
 // Test that a ui::Event and blink::WebInputEvent made from the same NSEvent
 // have the same values for comparable fields.
-TEST(WebInputEventBuilderMacTest, DISABLED_ScrollWheelMatchesUIEvent) {
+TEST(WebInputEventBuilderMacTest, ScrollWheelMatchesUIEvent) {
+  bool precise = false;
   CGFloat delta_x = 123;
   CGFloat delta_y = 321;
   NSPoint location = NSMakePoint(11, 22);
 
   // WebMouseWheelEventBuilder requires a non-nil view to map coordinates. So
   // create a dummy window, but don't show it. It will be released when closed.
   NSWindow* window =
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO];
 
   NSEvent* mac_event = cocoa_test_event_utils::TestScrollEvent(
-      location, window, delta_x, delta_y);
+      location, window, delta_x, delta_y, precise, NSEventPhaseNone,
+      NSEventPhaseNone);
+  EXPECT_EQ(delta_x, [mac_event deltaX]);
+  EXPECT_EQ(delta_y, [mac_event deltaY]);
 
   blink::WebMouseWheelEvent web_event =
       content::WebMouseWheelEventBuilder::Build(mac_event,
                                                 [window contentView]);
   ui::MouseWheelEvent ui_event(mac_event);
 
   EXPECT_EQ(delta_x * ui::kScrollbarPixelsPerCocoaTick, web_event.deltaX);
   EXPECT_EQ(web_event.deltaX, ui_event.x_offset());
 
   EXPECT_EQ(delta_y * ui::kScrollbarPixelsPerCocoaTick, web_event.deltaY);
   EXPECT_EQ(web_event.deltaY, ui_event.y_offset());
 
   EXPECT_EQ(11, web_event.x);
   EXPECT_EQ(web_event.x, ui_event.x());
 
   // Both ui:: and blink:: events use an origin at the top-left.
   EXPECT_EQ(100 - 22, web_event.y);
   EXPECT_EQ(web_event.y, ui_event.y());
   [window close];
 }