Allow content embedder to set a cursor for RenderWidgetHost

content/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 <stddef.h>
 
 #include "base/pickle.h"
 #include "build/build_config.h"
 #include "content/common/cursors/webcursor.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 143 matching lines @@
   // Data len including enough data for a 2x2 image.
   ok_custom_pickle.WriteInt(4 * 4);
   for (size_t i = 0; i < 4; i++)
     ok_custom_pickle.WriteUInt32(0);
   // Custom Windows message.
   ok_custom_pickle.WriteUInt32(0);
   base::PickleIterator iter(ok_custom_pickle);
   EXPECT_TRUE(custom_cursor.Deserialize(&iter));
 
   // Convert to WebCursorInfo, make sure the hotspot got clamped.
-  WebCursor::CursorInfo info;
+  CursorInfo info;
   custom_cursor.GetCursorInfo(&info);
   EXPECT_EQ(gfx::Point(1, 1), info.hotspot);
 
   // Set hotspot to an invalid point again, pipe back through WebCursor,
   // and make sure the hotspot got clamped again.
   info.hotspot = gfx::Point(-1, -1);
   custom_cursor.InitFromCursorInfo(info);
   custom_cursor.GetCursorInfo(&info);
   EXPECT_EQ(gfx::Point(0, 0), info.hotspot);
 }
@@ skipping 42 matching lines @@
   base::PickleIterator iter(ok_custom_pickle);
   EXPECT_TRUE(custom_cursor.Deserialize(&iter));
 }
 
 TEST(WebCursorTest, AlphaConversion) {
   SkBitmap bitmap;
   SkPMColor testColor = SkPreMultiplyARGB(10, 255, 255, 255);
   bitmap.allocN32Pixels(1,1);
   SkAutoLockPixels bitmap_lock(bitmap);
   *bitmap.getAddr32(0, 0) = testColor;
-  WebCursor::CursorInfo cursor_info;
+  CursorInfo cursor_info;
   cursor_info.type = WebCursorInfo::kTypeCustom;
   cursor_info.custom_image = bitmap;
   cursor_info.image_scale_factor = 1;
   WebCursor custom_cursor;
 
   // This round trip will convert the cursor to unpremultiplied form.
   custom_cursor.InitFromCursorInfo(cursor_info);
   custom_cursor.GetCursorInfo(&cursor_info);
   {
     SkAutoLockPixels lock(cursor_info.custom_image);
@@ skipping 25 matching lines @@
               SkPreMultiplyColor(*cursor_info.custom_image.getAddr32(0,0)));
   }
 #endif
 }
 
 #if defined(USE_AURA)
 TEST(WebCursorTest, CursorScaleFactor) {
   display::Display display;
   display.set_device_scale_factor(80.2f);
 
-  WebCursor::CursorInfo info;
+  CursorInfo info;
   info.image_scale_factor = 2.0f;
 
   WebCursor cursor;
   cursor.InitFromCursorInfo(info);
   cursor.SetDisplayInfo(display);
 
   EXPECT_EQ(40.1f, cursor.GetCursorScaleFactor());
 }
 
 TEST(WebCursorTest, UnscaledImageCopy) {
-  WebCursor::CursorInfo info;
+  CursorInfo info;
   info.type = WebCursorInfo::kTypeCustom;
   info.hotspot = gfx::Point(0, 1);
 
   SkImageInfo image_info = SkImageInfo::MakeN32(2, 2, kUnpremul_SkAlphaType);
   info.custom_image = SkBitmap();
   info.custom_image.setInfo(image_info);
   info.custom_image.allocN32Pixels(2, 2);
   info.custom_image.eraseColor(0xFFFFFFFF);
 
   WebCursor cursor;
@@ skipping 23 matching lines @@
 }
 #endif
 
 #if defined(OS_WIN)
 namespace {
 
 void ScaleCursor(float scale_factor, int hotspot_x, int hotspot_y) {
   display::Display display;
   display.set_device_scale_factor(scale_factor);
 
-  WebCursor::CursorInfo info;
+  CursorInfo info;
   info.type = WebCursorInfo::kTypeCustom;
   info.hotspot = gfx::Point(hotspot_x, hotspot_y);
 
   info.custom_image = SkBitmap();
   info.custom_image.allocN32Pixels(10, 10);
   info.custom_image.eraseColor(0);
 
   WebCursor cursor;
   cursor.SetDisplayInfo(display);
   cursor.InitFromCursorInfo(info);
@@ skipping 12 matching lines @@
 }  // namespace
 
 TEST(WebCursorTest, WindowsCursorScaledAtHiDpi) {
   ScaleCursor(2.0f, 4, 6);
   ScaleCursor(1.5f, 2, 8);
   ScaleCursor(1.25f, 3, 7);
 }
 #endif
 
 }  // namespace content