Linux Aura: Fixes and improvements for cursor loader

ui/base/x/x11_util.h

 // 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.
 
 #ifndef UI_BASE_X_X11_UTIL_H_
 #define UI_BASE_X_X11_UTIL_H_
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions do not require the Xlib headers to be included (which is why
@@ skipping 30 matching lines @@
 // the UI thread. Thus, they don't support multiple displays.
 
 // These functions cache their results ---------------------------------
 
 // Returns true if the system supports XINPUT2.
 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.
 UI_BASE_X_EXPORT::Cursor CreateReffedCustomXCursor(XcursorImage* image);
 
 // Increases the refcount of the custom cursor.
 UI_BASE_X_EXPORT void RefCustomXCursor(::Cursor cursor);
 
 // Decreases the refcount of the custom cursor, and destroys it if it reaches 0.
 UI_BASE_X_EXPORT void UnrefCustomXCursor(::Cursor cursor);
@@ skipping 256 matching lines @@
   void reset(::Cursor cursor);
 
  private:
   ::Cursor cursor_;
   XDisplay* display_;
 
   DISALLOW_COPY_AND_ASSIGN(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);
 
 }  // namespace test
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_H_