Start using WebCursorInfo from the WebKit API. WebCursorInfo is a...

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 2008 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/string_util.h"
 #include "base/sys_string_conversions.h"
+#include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webmenurunner_mac.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
+using WebKit::WebCursorInfo;
 using WebKit::WebRect;
 
 // WebViewDelegate -----------------------------------------------------------
 
 TestWebViewDelegate::~TestWebViewDelegate() {
 }
 
 WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     WebView* webview,
     const GURL& url,
@@ skipping 88 matching lines @@
     // period of time after this call returns (cleanup is done after going back
     // to the event loop), so we should make sure we don't leave it dangling.
     [win performClose:nil];
     shell_ = NULL;
   } else if (webwidget == shell_->popup()) {
     shell_->ClosePopup();
   }
 }
 
 void TestWebViewDelegate::SetCursor(WebWidget* webwidget,
-                                    const WebCursor& cursor) {
-  NSCursor* ns_cursor = cursor.GetCursor();
+                                    const WebCursorInfo& cursor_info) {
+  NSCursor* ns_cursor = WebCursor(cursor_info).GetCursor();
   [ns_cursor set];
 }
 
 void TestWebViewDelegate::GetWindowRect(WebWidget* webwidget,
                                         WebRect* out_rect) {
   DCHECK(out_rect);
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
     NSView *view = host->view_handle();
     NSRect rect = [view frame];
     *out_rect = gfx::Rect(NSRectToCGRect(rect));
@@ skipping 66 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(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];
 }