Do not scale cursor image for 2x image

ui/base/cursor/cursor_loader_x11_unittest.cc

 // Copyright 2013 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 "ui/base/cursor/cursor_loader_x11.h"
 
 #undef None
 #undef Bool
 
 #include "base/logging.h"
+#include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/cursor/cursor_util.h"
+#include "ui/gfx/geometry/point.h"
 
 namespace ui {
 
-TEST(CursorLoaderX11Test, ScaleAndRotate) {
+TEST(CursorLoaderX11Test, ScaleAndRotateCursorBitmapAndHotpoint) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 5);
   bitmap.allocPixels();
   bitmap.eraseColor(SK_ColorBLACK);
 
   gfx::Point hotpoint(3,4);
 
   ScaleAndRotateCursorBitmapAndHotpoint(1.0f,
                                         gfx::Display::ROTATE_0,
                                         &bitmap,
@@ skipping 21 matching lines @@
 
   ScaleAndRotateCursorBitmapAndHotpoint(1.0f,
                                         gfx::Display::ROTATE_270,
                                         &bitmap,
                                         &hotpoint);
   EXPECT_EQ(20, bitmap.width());
   EXPECT_EQ(10, bitmap.height());
   EXPECT_EQ("14,2", hotpoint.ToString());
 }
 
+TEST(CursorLoaderX11Test, Scale) {
+  const int kCursorId = 1;
+  test::ResetXCursorCache();
+  CursorLoaderX11 loader;
+  loader.set_scale(1.0f);
+
+  loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
+  const XcursorImage* image =
+      test::GetCachedXcursorImage(loader.GetCursorForTest(kCursorId));
+  int height = image->height;
+  int width = image->width;
+  loader.UnloadAll();
+
+  // Load 2x cursor and make sure its size is 2x of the 1x cusor.
+  loader.set_scale(2.0f);
+  loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
+  image = test::GetCachedXcursorImage(loader.GetCursorForTest(kCursorId));
+  EXPECT_EQ(height * 2, static_cast<int>(image->height));
+  EXPECT_EQ(width * 2, static_cast<int>(image->width));
+
+  test::ResetXCursorCache();
+}
+
 }  // namespace ui