Linux Aura: Fixes and improvements for cursor loader

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 ec1c21c080876aefc67d343d3f03a192151ffc9b..1ca840418089c6c8c994fda03a167b5edfb418c8 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -48,10 +48,6 @@ UI_BASE_X_EXPORT bool IsXInput2Available();
 // Return true iff the display supports Xrender
 UI_BASE_X_EXPORT bool QueryRenderSupport(XDisplay* dpy);
 
-// Returns an X11 Cursor, sharable across the process.
-// |cursor_shape| is an X font cursor shape, see XCreateFontCursor().
-UI_BASE_X_EXPORT::Cursor GetXCursor(int cursor_shape);
-
 // 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.
@@ -328,9 +324,6 @@ class UI_BASE_X_EXPORT XScopedCursor {
 };
 
 namespace test {
-// Resets the cache used by GetXCursor(). Only useful for tests that may delete
-// the display.
-UI_BASE_X_EXPORT void ResetXCursorCache();
 
 // Returns the cached XcursorImage for |cursor|.
 UI_BASE_X_EXPORT const XcursorImage* GetCachedXcursorImage(::Cursor cursor);