Remove more non-aura windows code.

webkit/common/cursors/webcursor_unittest.cc

 // 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 "base/pickle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "webkit/common/cursors/webcursor.h"
 
 using blink::WebCursorInfo;
@@ skipping 116 matching lines @@
   scale_tiny_custom_pickle.WriteFloat(0.001f);
   // Data len including enough data for a 1x1 image.
   scale_tiny_custom_pickle.WriteInt(4);
   scale_tiny_custom_pickle.WriteUInt32(0);
   // Custom Windows message.
   scale_tiny_custom_pickle.WriteUInt32(0);
   iter = PickleIterator(scale_tiny_custom_pickle);
   EXPECT_FALSE(custom_cursor.Deserialize(&iter));
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-TEST(WebCursorTest, WindowsCursorConversion) {
-  WebCursor custom_cursor;
-  Pickle win32_custom_pickle;
-  WebCursor win32_custom_cursor;
-  win32_custom_cursor.InitFromExternalCursor(
-      reinterpret_cast<HCURSOR>(1000));
-  EXPECT_TRUE(win32_custom_cursor.Serialize(&win32_custom_pickle));
-  PickleIterator iter(win32_custom_pickle);
-  EXPECT_TRUE(custom_cursor.Deserialize(&iter));
-  EXPECT_EQ(reinterpret_cast<HCURSOR>(1000), custom_cursor.GetCursor(NULL));
-}
-#endif  // OS_WIN
-
 TEST(WebCursorTest, ClampHotspot) {
   WebCursor custom_cursor;
   // This is a valid custom cursor.
   Pickle ok_custom_pickle;
   // Type and hotspots.
   ok_custom_pickle.WriteInt(WebCursorInfo::TypeCustom);
   // Hotspot is invalid --- outside the bounds of the image.
   ok_custom_pickle.WriteInt(5);
   ok_custom_pickle.WriteInt(5);
   // X & Y
@@ skipping 74 matching lines @@
   PickleIterator iter(ok_custom_pickle);
   EXPECT_TRUE(custom_cursor.Deserialize(&iter));
 
 #if defined(TOOLKIT_GTK)
   // On GTK+ using platforms, we should get a real native GdkCursor object back
   // (and the memory used should automatically be freed by the WebCursor object
   // for valgrind tests).
   EXPECT_TRUE(custom_cursor.GetCustomCursor());
 #endif
 }