Prepare ui/ module for compilation with OS X 10.7 deployment target.

ui/views/test/event_generator_delegate_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_target.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/events/event_targeter.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/mac/coordinate_conversion.h"
 
 namespace {
 
 // Set (and always cleared) in EmulateSendEvent() to provide an answer for
 // [NSApp currentEvent].
 NSEvent* g_current_event = nil;
 
 }  // namespace
 
 @interface NSEventDonor : NSObject
 @end
 
 @interface NSApplicationDonor : NSObject
 @end
 
 namespace {
 
 NSPoint ConvertRootPointToTarget(NSWindow* target,
                                  const gfx::Point& point_in_root) {
-  // Normally this would do [NSWindow convertScreenToBase:]. However, Cocoa can
-  // reposition the window on screen and make things flaky. Initially, just
+  // 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());
 }
 
 // Inverse of ui::EventFlagsFromModifiers().
 NSUInteger EventFlagsToModifiers(int flags) {
   NSUInteger modifiers = 0;
@@ skipping 416 matching lines @@
 + (NSPoint)mouseLocation {
   ui::test::EventGenerator* generator = GetActiveGenerator();
   if (!generator)
     return [NSEventDonor mouseLocation];  // Call original implementation.
 
   // The location is the point in the root window which, for desktop widgets, is
   // the widget itself.
   gfx::Point point_in_root = generator->current_location();
   NSWindow* window = EventGeneratorDelegateMac::GetInstance()->window();
   NSPoint point_in_window = ConvertRootPointToTarget(window, point_in_root);
-  return [window convertBaseToScreen:point_in_window];
+  return ui::ConvertPointFromWindowToScreen(window, point_in_window);
 }
 
 @end
 
 @implementation NSApplicationDonor
 
 - (NSEvent*)currentEvent {
   if (g_current_event)
     return g_current_event;
 
   // Find the original implementation and invoke it.
   IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
   return original(self, _cmd);
 }
 
 @end