Minor cleanup to webcursors.

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 287 matching lines @@
   gfx::Point hotspot;
   cursor.CreateScaledBitmapAndHotspotFromCustomData(&image_copy, &hotspot);
 
   EXPECT_EQ(kBGRA_8888_SkColorType, image_copy.colorType());
   EXPECT_EQ(kUnpremul_SkAlphaType, image_copy.alphaType());
   EXPECT_EQ(2, image_copy.width());
   EXPECT_EQ(2, image_copy.height());
   EXPECT_EQ(0, hotspot.x());
   EXPECT_EQ(1, hotspot.y());
 }
+
+TEST(WebCursorTest, CopyDeviceScaleFactor) {
+  WebCursor cursor1;
+  EXPECT_EQ(1.f, cursor1.GetCursorScaleFactor());
+
+  display::Display display;
+  display.set_device_scale_factor(19.333f);
+  cursor1.SetDisplayInfo(display);
+  WebCursor cursor2 = cursor1;
+  EXPECT_EQ(19.333f, cursor2.GetCursorScaleFactor());
+}
 #endif
 
 #if defined(OS_WIN)
-void ScaleCursor(float scaleFactor, int hotspotX, int hotspotY) {
+namespace {

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

\n after { (make opening and closing match)

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

Done.

+void ScaleCursor(float scale_factor, int hotspot_x, int hotspot_y) {
   display::Display display;
-  display.set_device_scale_factor(scaleFactor);
+  display.set_device_scale_factor(scale_factor);
 
   WebCursor::CursorInfo info;
   info.type = WebCursorInfo::TypeCustom;
-  info.hotspot = gfx::Point(hotspotX, hotspotY);
+  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);
 
-  HCURSOR windowsCursorHandle = cursor.GetPlatformCursor();
-  EXPECT_NE(nullptr, windowsCursorHandle);
-  ICONINFO windowsIconInfo;
-  EXPECT_TRUE(GetIconInfo(windowsCursorHandle, &windowsIconInfo));
-  EXPECT_FALSE(windowsIconInfo.fIcon);
-  EXPECT_EQ(static_cast<DWORD>(scaleFactor * hotspotX),
-            windowsIconInfo.xHotspot);
-  EXPECT_EQ(static_cast<DWORD>(scaleFactor * hotspotY),
-            windowsIconInfo.yHotspot);
+  HCURSOR windows_cursor_handle = cursor.GetPlatformCursor();
+  EXPECT_NE(nullptr, windows_cursor_handle);
+  ICONINFO windows_icon_info;
+  EXPECT_TRUE(GetIconInfo(windows_cursor_handle, &windows_icon_info));
+  EXPECT_FALSE(windows_icon_info.fIcon);
+  EXPECT_EQ(static_cast<DWORD>(scale_factor * hotspot_x),
+            windows_icon_info.xHotspot);
+  EXPECT_EQ(static_cast<DWORD>(scale_factor * hotspot_y),
+            windows_icon_info.yHotspot);
 }
 
+} // namespace
+
 TEST(WebCursorTest, WindowsCursorScaledAtHiDpi) {
   ScaleCursor(2.0f, 4, 6);
   ScaleCursor(1.5f, 2, 8);
   ScaleCursor(1.25f, 3, 7);
 }
 #endif
 
 }  // namespace content