Minor cleanup to webcursors.

content/common/cursors/webcursor.cc

Index: content/common/cursors/webcursor.cc
diff --git a/content/common/cursors/webcursor.cc b/content/common/cursors/webcursor.cc
index 51db2eac72969d60bd8cc61684510bf4ac3b46ca..ef41bf92dcaf983477597ed17cd7098e09677390 100644
--- a/content/common/cursors/webcursor.cc
+++ b/content/common/cursors/webcursor.cc
@@ -18,12 +18,6 @@ namespace content {
 WebCursor::WebCursor()
     : type_(WebCursorInfo::TypePointer),
       custom_scale_(1) {
-#if defined(OS_WIN)
-  external_cursor_ = NULL;
-#endif
-#if defined(USE_AURA)
-  device_scale_factor_ = 1.0f;
-#endif
   InitPlatformData();
 }
 
@@ -48,13 +42,6 @@ const WebCursor& WebCursor::operator=(const WebCursor& other) {
 void WebCursor::InitFromCursorInfo(const CursorInfo& cursor_info) {
   Clear();
 
-#if defined(OS_WIN)
-  if (cursor_info.external_handle) {
-    InitFromExternalCursor(cursor_info.external_handle);
-    return;
-  }
-#endif
-
   type_ = cursor_info.type;
   hotspot_ = cursor_info.hotspot;
   if (IsCustom())
@@ -69,10 +56,6 @@ void WebCursor::GetCursorInfo(CursorInfo* cursor_info) const {
   cursor_info->hotspot = hotspot_;
   ImageFromCustomData(&cursor_info->custom_image);
   cursor_info->image_scale_factor = custom_scale_;
-
-#if defined(OS_WIN)
-  cursor_info->external_handle = external_cursor_;
-#endif
 }
 
 bool WebCursor::Deserialize(base::PickleIterator* iter) {
@@ -198,9 +181,6 @@ void WebCursor::InitFromExternalCursor(HCURSOR cursor) {
   WebCursorInfo::Type cursor_type = ToCursorType(cursor);
 
   InitFromCursorInfo(CursorInfo(cursor_type));
-
-  if (cursor_type == WebCursorInfo::TypeCustom)

[scottmg, 2016/05/13 00:27:21]

Do we need to CHECK(cursor_type != WebCursorInfo::TypeCustom) here?

[Bret, 2016/05/13 00:53:16]

Ah nope, just forgot to delete this function.

-    external_cursor_ = cursor;
 }
 
 #endif  // defined(OS_WIN)