Do not scale cursor image for 2x image

ash/wm/ash_native_cursor_manager_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 "ash/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #endif
 
+#if defined(USE_X11)
+#include "grit/ui_resources.h"
+#include "ui/base/cursor/cursor_loader_x11.h"
+#endif
+
 namespace ash {
 namespace test {
 
 namespace {
 
 // A delegate for recording a mouse event location.
 class MouseEventLocationDelegate : public aura::test::TestWindowDelegate {
  public:
   MouseEventLocationDelegate() {}
   virtual ~MouseEventLocationDelegate() {}
@@ skipping 133 matching lines @@
   UpdateDisplay("800x800*2");
   EXPECT_EQ(2.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
   display_manager->SetDisplayUIScale(display_id, 2.0f);
   EXPECT_EQ(1.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 
+#if defined(USE_X11)
+// This test is in ash_unittests becuase ui_unittests does not include
+// 2x assets. crbug.com/372541.
+TEST_F(AshNativeCursorManagerTest, CursorLoaderX11Test) {
+  const int kCursorId = 1;
+  ui::CursorLoaderX11 loader;
+  loader.set_scale(1.0f);
+
+  loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
+  const XcursorImage* image = loader.GetXcursorImageForTest(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 = loader.GetXcursorImageForTest(kCursorId);
+  EXPECT_EQ(height * 2, static_cast<int>(image->height));
+  EXPECT_EQ(width * 2, static_cast<int>(image->width));
+}
+#endif
+
 }  // namespace test
 }  // namespace ash