Revert of Mac: Share kScrollbarPixelsPerCocoaTick between ui:: and blink:: events

ui/events/test/cocoa_test_event_utils.h

 // 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.
 
 #ifndef UI_EVENTS_TEST_COCOA_TEST_EVENT_UTILS_H_
 #define UI_EVENTS_TEST_COCOA_TEST_EVENT_UTILS_H_
 
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-class.h>
 
 #include <utility>
 
 #include "ui/events/keycodes/dom/dom_key.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace cocoa_test_event_utils {
 
-// Converts |window_point| in |window| coordinates (origin at bottom left of
-// window frame) to a point in global display coordinates for a CGEvent (origin
-// at top left of primary screen).
-CGPoint ScreenPointFromWindow(NSPoint window_point, NSWindow* window);
-
-// Converts |event| to an NSEvent with a timestamp from ui::EventTimeForNow(),
-// and attaches |window| to it.
-NSEvent* AttachWindowToCGEvent(CGEventRef event, NSWindow* window);
-
 // Create synthetic mouse events for testing. Currently these are very
 // basic, flesh out as needed.  Points are all in window coordinates;
 // where the window is not specified, coordinate system is undefined
 // (but will be repeated when the event is queried).
 NSEvent* MouseEventAtPoint(NSPoint point, NSEventType type,
                            NSUInteger modifiers);
 NSEvent* MouseEventWithType(NSEventType type, NSUInteger modifiers);
 NSEvent* MouseEventAtPointInWindow(NSPoint point,
                                    NSEventType type,
                                    NSWindow* window,
                                    NSUInteger clickCount);
 NSEvent* RightMouseDownAtPoint(NSPoint point);
 NSEvent* RightMouseDownAtPointInWindow(NSPoint point, NSWindow* window);
 NSEvent* LeftMouseDownAtPoint(NSPoint point);
 NSEvent* LeftMouseDownAtPointInWindow(NSPoint point, NSWindow* window);
 
 // Return a mouse down and an up event with the given |clickCount| at
 // |view|'s midpoint.
 std::pair<NSEvent*, NSEvent*> MouseClickInView(NSView* view,
                                                NSUInteger clickCount);
 
 // Return a right mouse down and an up event with the given |clickCount| at
 // |view|'s midpoint.
 std::pair<NSEvent*, NSEvent*> RightMouseClickInView(NSView* view,
                                                     NSUInteger clickCount);
 
-// Creates a test scroll event. Currently only events for a "real" mouse wheel
-// are supported (-hasPreciseScrollingDeltas is NO).  If |window| is nil,
-// |location| is assumed to be AppKit screen coordinates (origin in bottom left
-// of primary screen).
-// TODO(tapted): Add event phase arguments to support trackpad scrolls also.
-NSEvent* TestScrollEvent(NSPoint location,
-                         NSWindow* window,
-                         CGFloat delta_x,
-                         CGFloat delta_y);
-
 // Returns a key event with the given character.
 NSEvent* KeyEventWithCharacter(unichar c);
 
 // Returns a key event with the given type and modifier flags.
 NSEvent* KeyEventWithType(NSEventType event_type, NSUInteger modifiers);
 
 // Returns a key event with the given key code, type, and modifier flags.
 NSEvent* KeyEventWithKeyCode(unsigned short key_code,
                              unichar c,
                              NSEventType event_type,
@@ skipping 14 matching lines @@
 // Creates a key event in a particular window.
 NSEvent* SynthesizeKeyEvent(NSWindow* window,
                             bool keyDown,
                             ui::KeyboardCode keycode,
                             NSUInteger flags,
                             ui::DomKey dom_key = ui::DomKey::NONE);
 
 }  // namespace cocoa_test_event_utils
 
 #endif  // UI_EVENTS_TEST_COCOA_TEST_EVENT_UTILS_H_