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..c7bacbed368c14de5643b3b4f411b6e318b1564e 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -65,10 +65,6 @@ 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
 // cursor is set to 1.
@@ -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

[Daniel Erat, 2014/05/12 21:19:48]

put this in an "#if defined(UNIT_TEST)" section instead?

[oshima, 2014/05/12 22:23:42]

I don't think this works because this is used in non unit test cc file
(aura_test_helper.cc and cursor_loader_x11.cc) . I just tried and got
link/compile errors.

I can change the CursorLoaderX11's test method to return ::Cursor
and call this from unittest though. Let me know if you like this change, or have
another suggestion.

(Note that reset XCursorCache still have to be outside of UNIT_TEST as it's
called from AuraTestHelper)

[Daniel Erat, 2014/05/12 23:02:22]

ah, never mind then. i was hoping that everything would get compiled with
UNIT_TEST defined when building tests, but maybe that's not how it works. this
seems fine to me, in that case (although i've maybe seen *ForTest() suffixes
added to testing-only method names more often than "test" namespaces being used
-- do you know if there's a presubmit check that things in the test namespace
don't get called from non-test code?)

+// 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_