Merge 122386 - Fix Mac custom cursor color.

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 2012 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 "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
@@ skipping 85 matching lines @@
 void TestWebViewDelegate::closeWidgetSoon() {
   if (this == shell_->delegate()) {
     NSWindow *win = shell_->mainWnd();
     [win performSelector:@selector(performClose:) withObject:nil afterDelay:0];
   } else if (this == shell_->popup_delegate()) {
     shell_->ClosePopup();
   }
 }
 
 void TestWebViewDelegate::didChangeCursor(const WebCursorInfo& cursor_info) {
-  NSCursor* ns_cursor = WebCursor(cursor_info).GetCursor();
+  NSCursor* ns_cursor = WebCursor(cursor_info).GetNativeCursor();
   [ns_cursor set];
 }
 
 WebRect TestWebViewDelegate::windowRect() {
   if (WebWidgetHost* host = GetWidgetHost()) {
     NSView *view = host->view_handle();
     NSRect rect = [view frame];
     return gfx::Rect(NSRectToCGRect(rect));
   }
   return WebRect();
@@ skipping 102 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const string16& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:UTF16ToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }