4 files changed, 23 insertions, 24 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 044459f..918fa81 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -529,7 +529,7 @@ bool BrowserPlugin::handleInputEvent(const blink::WebInputEvent& event,
       new BrowserPluginHostMsg_HandleInputEvent(browser_plugin_instance_id_,
                                                 view_rect_,
                                                 &event));
-  GetWebKitCursorInfo(cursor_, &cursor_info);
+  GetWebCursorInfo(cursor_, &cursor_info);
 
   // Although we forward this event to the guest, we don't report it as consumed
   // since other targets of this event in Blink never get that chance either.
diff --git a/content/renderer/cursor_utils.cc b/content/renderer/cursor_utils.cc
index 2ad8a9f..371aaad 100644
--- a/content/renderer/cursor_utils.cc
+++ b/content/renderer/cursor_utils.cc
@@ -12,33 +12,32 @@ using blink::WebCursorInfo;
 
 namespace content {
 
-bool GetWebKitCursorInfo(const WebCursor& cursor,
-                         WebCursorInfo* webkit_cursor_info) {
+bool GetWebCursorInfo(const WebCursor& cursor,
+                      WebCursorInfo* web_cursor_info) {
   WebCursor::CursorInfo cursor_info;
   cursor.GetCursorInfo(&cursor_info);
 
-  webkit_cursor_info->type = cursor_info.type;
-  webkit_cursor_info->hotSpot = cursor_info.hotspot;
-  webkit_cursor_info->customImage = cursor_info.custom_image;
-  webkit_cursor_info->imageScaleFactor = cursor_info.image_scale_factor;
+  web_cursor_info->type = cursor_info.type;
+  web_cursor_info->hotSpot = cursor_info.hotspot;
+  web_cursor_info->customImage = cursor_info.custom_image;
+  web_cursor_info->imageScaleFactor = cursor_info.image_scale_factor;
 #if defined(OS_WIN)
-  webkit_cursor_info->externalHandle = cursor_info.external_handle;
+  web_cursor_info->externalHandle = cursor_info.external_handle;
 #endif
   return true;
 }
 
-void InitializeCursorFromWebKitCursorInfo(
-    WebCursor* cursor,
-    const WebCursorInfo& webkit_cursor_info) {
-  WebCursor::CursorInfo web_cursor_info;
-  web_cursor_info.type = webkit_cursor_info.type;
-  web_cursor_info.image_scale_factor = webkit_cursor_info.imageScaleFactor;
-  web_cursor_info.hotspot = webkit_cursor_info.hotSpot;
-  web_cursor_info.custom_image = webkit_cursor_info.customImage.getSkBitmap();
+void InitializeCursorFromWebCursorInfo(WebCursor* cursor,
+                                       const WebCursorInfo& web_cursor_info) {
+  WebCursor::CursorInfo cursor_info;
+  cursor_info.type = web_cursor_info.type;
+  cursor_info.image_scale_factor = web_cursor_info.imageScaleFactor;
+  cursor_info.hotspot = web_cursor_info.hotSpot;
+  cursor_info.custom_image = web_cursor_info.customImage.getSkBitmap();
 #if defined(OS_WIN)
-  web_cursor_info.external_handle = webkit_cursor_info.externalHandle;
+  cursor_info.external_handle = web_cursor_info.externalHandle;
 #endif
-  cursor->InitFromCursorInfo(web_cursor_info);
+  cursor->InitFromCursorInfo(cursor_info);
 }
 
 }  // namespce content
diff --git a/content/renderer/cursor_utils.h b/content/renderer/cursor_utils.h
index e19f758..595e49a 100644
--- a/content/renderer/cursor_utils.h
+++ b/content/renderer/cursor_utils.h
@@ -14,13 +14,13 @@ struct WebCursorInfo;
 namespace content {
 
 // Adapts our cursor info to blink::WebCursorInfo.
-bool GetWebKitCursorInfo(const WebCursor& cursor,
-                         blink::WebCursorInfo* webkit_cursor_info);
+bool GetWebCursorInfo(const WebCursor& cursor,
+                      blink::WebCursorInfo* web_cursor_info);
 
-// Adapts blink::CursorInfo to our cursor.
-void InitializeCursorFromWebKitCursorInfo(
+// Adapts blink::WebCursorInfo to our cursor.
+void InitializeCursorFromWebCursorInfo(
     WebCursor* cursor,
-    const blink::WebCursorInfo& webkit_cursor_info);
+    const blink::WebCursorInfo& web_cursor_info);
 
 }  // namespace content
 
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index cfb861b..c9a9a41 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1489,7 +1489,7 @@ void RenderWidget::QueueMessage(IPC::Message* msg,
 void RenderWidget::didChangeCursor(const WebCursorInfo& cursor_info) {
   // TODO(darin): Eliminate this temporary.
   WebCursor cursor;
-  InitializeCursorFromWebKitCursorInfo(&cursor, cursor_info);
+  InitializeCursorFromWebCursorInfo(&cursor, cursor_info);
   // Only send a SetCursor message if we need to make a change.
   if (!current_cursor_.IsEqual(cursor)) {
     current_cursor_ = cursor;