Minor cleanup to webcursors.

content/common/cursors/webcursor.h

Index: content/common/cursors/webcursor.h
diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h
index 9bbdd1e1d231c69f7c2fed285a8c4a018437b3fb..07d2bca472bf66866b946e3533946d470783aa53 100644
--- a/content/common/cursors/webcursor.h
+++ b/content/common/cursors/webcursor.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
@@ -49,26 +48,17 @@ class CONTENT_EXPORT WebCursor {
     explicit CursorInfo(blink::WebCursorInfo::Type cursor_type)
         : type(cursor_type),
           image_scale_factor(1) {
-#if defined(OS_WIN)
-      external_handle = NULL;
-#endif
     }
 
     CursorInfo()
         : type(blink::WebCursorInfo::TypePointer),
           image_scale_factor(1) {
-#if defined(OS_WIN)
-      external_handle = NULL;
-#endif
     }
 
     blink::WebCursorInfo::Type type;
     gfx::Point hotspot;
     float image_scale_factor;
     SkBitmap custom_image;
-#if defined(OS_WIN)
-    HCURSOR external_handle;
-#endif
   };
 
   WebCursor();
@@ -98,13 +88,6 @@ class CONTENT_EXPORT WebCursor {
   // Returns a native cursor representing the current WebCursor instance.
   gfx::NativeCursor GetNativeCursor();
 
-#if defined(OS_WIN)
-  // Initialize this from the given Windows cursor. The caller must ensure that
-  // the HCURSOR remains valid by not invoking the DestroyCursor/DestroyIcon
-  // APIs on it.
-  void InitFromExternalCursor(HCURSOR handle);
-#endif
-
 #if defined(USE_AURA)
   ui::PlatformCursor GetPlatformCursor();
 
@@ -116,13 +99,10 @@ class CONTENT_EXPORT WebCursor {
   void CreateScaledBitmapAndHotspotFromCustomData(
       SkBitmap* bitmap,
       gfx::Point* hotspot);
-  FRIEND_TEST_ALL_PREFIXES(WebCursorTest,
-                           CreateScaledBitmapAndHotspotFromCustomData);
 
 #elif defined(OS_WIN)
   // Returns a HCURSOR representing the current WebCursor instance.
-  // The ownership of the HCURSOR (does not apply to external cursors) remains
-  // with the WebCursor instance.
+  // The ownership of the HCURSOR remains with the WebCursor instance.
   HCURSOR GetCursor(HINSTANCE module_handle);
 
 #elif defined(OS_MACOSX)
@@ -179,12 +159,6 @@ class CONTENT_EXPORT WebCursor {
   float custom_scale_;
   std::vector<char> custom_data_;
 
-#if defined(OS_WIN)
-  // An externally generated HCURSOR. We assume that it remains valid, i.e we
-  // don't attempt to copy the HCURSOR.
-  HCURSOR external_cursor_;
-#endif
-
 #if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE))
   // Only used for custom cursors.
   ui::PlatformCursor platform_cursor_;