Do not scale cursor image for 2x image

ui/base/x/x11_util.h

Index: ui/base/x/x11_util.h
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index cd347c63c6fe8f7ed85a8da2cb63b8b66aef483e..77bad8ad8e94676af7ff2496276a3b01c1a5ccdb 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -65,12 +65,8 @@ UI_BASE_EXPORT bool QueryRenderSupport(XDisplay* dpy);
 // |cursor_shape| is an X font cursor shape, see XCreateFontCursor().
 UI_BASE_EXPORT ::Cursor GetXCursor(int cursor_shape);
 
-// Resets the cache used by GetXCursor(). Only useful for tests that may delete
-// the display.
-UI_BASE_EXPORT void ResetXCursorCache();
-
 // Creates a custom X cursor from the image. This takes ownership of image. The
-// caller must not free/modify the image. The refcount of the newly created
+// caller temust not free/modify the image. The refcount of the newly created

[tdanderson, 2014/05/12 17:30:24]

typo?

[oshima, 2014/05/12 20:42:09]

oops, fixed. thank you for the catch.

 // cursor is set to 1.
 UI_BASE_EXPORT ::Cursor CreateReffedCustomXCursor(XcursorImage* image);
 
@@ -339,6 +335,16 @@ class UI_BASE_EXPORT XScopedCursor {
   DISALLOW_COPY_AND_ASSIGN(XScopedCursor);
 };
 
+namespace test {
+// Resets the cache used by GetXCursor(). Only useful for tests that may delete
+// the display.
+UI_BASE_EXPORT void ResetXCursorCache();
+
+// Returns the cached XcursorImage for |cursor|.
+UI_BASE_EXPORT const XcursorImage* GetCachedXcursorImage(::Cursor cursor);
+
+}  // namespace test
+
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_H_