Prepare chrome/ for compilation with OS X 10.7 deployment target.

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.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 "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/components_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest_mac.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 @class ConstrainedWindowButton;
 
 @interface PermissionBubbleController (ExposedForTesting)
 - (void)ok:(id)sender;
 - (void)onAllow:(id)sender;
 - (void)onBlock:(id)sender;
@@ skipping 318 matching lines @@
       @selector(hasLocationBar));
 
   NSPoint anchor = [controller_ getExpectedAnchorPoint];
 
   // Expected anchor location will be the same as the page info bubble.
   NSWindow* window = browser()->window()->GetNativeWindow();
   BrowserWindowController* controller =
       [BrowserWindowController browserWindowControllerForWindow:window];
   LocationBarViewMac* location_bar_bridge = [controller locationBarBridge];
   NSPoint expected = location_bar_bridge->GetPageInfoBubblePoint();
-  expected = [window convertBaseToScreen:expected];
+  expected = ui::ConvertPointFromWindowToScreen(window, expected);
   EXPECT_NSEQ(expected, anchor);
 }
 
 TEST_F(PermissionBubbleControllerTest, AnchorPositionWithoutLocationBar) {
   base::mac::ScopedObjCClassSwizzler locationSwizzle(
       [PermissionBubbleController class],
       [MockBubbleNoLocationBar class],
       @selector(hasLocationBar));
 
   NSPoint anchor = [controller_ getExpectedAnchorPoint];
 
   // Expected anchor location will be top center when there's no location bar.
   NSWindow* window = browser()->window()->GetNativeWindow();
   NSRect frame = [window frame];
   NSPoint expected = NSMakePoint(frame.size.width / 2, frame.size.height);
-  expected = [window convertBaseToScreen:expected];
+  expected = ui::ConvertPointFromWindowToScreen(window, expected);
   EXPECT_NSEQ(expected, anchor);
 }
 
 TEST_F(PermissionBubbleControllerTest,
     AnchorPositionDifferentWithAndWithoutLocationBar) {
   NSPoint withLocationBar;
   {
     base::mac::ScopedObjCClassSwizzler locationSwizzle(
         [PermissionBubbleController class],
         [MockBubbleYesLocationBar class],
         @selector(hasLocationBar));
     withLocationBar = [controller_ getExpectedAnchorPoint];
   }
 
   NSPoint withoutLocationBar;
   {
     base::mac::ScopedObjCClassSwizzler locationSwizzle(
         [PermissionBubbleController class],
         [MockBubbleNoLocationBar class],
         @selector(hasLocationBar));
     withoutLocationBar = [controller_ getExpectedAnchorPoint];
   }
 
   // The bubble should be in different places depending if the location bar is
   // available or not.
   EXPECT_NSNE(withLocationBar, withoutLocationBar);
 }