Fix cursor getting invisible after moving a window.

ash/wm/cursor_manager.h

Index: ash/wm/cursor_manager.h
diff --git a/ash/wm/cursor_manager.h b/ash/wm/cursor_manager.h
index f5b5548b8684b4e300c1a8619684e82b543f5b71..6783807f0e9e41021a979d25766ea6f969d4f1b6 100644
--- a/ash/wm/cursor_manager.h
+++ b/ash/wm/cursor_manager.h
@@ -5,10 +5,10 @@
 #ifndef ASH_WM_CURSOR_MANAGER_H_
 #define ASH_WM_CURSOR_MANAGER_H_
 
+#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/aura_export.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -19,8 +19,21 @@ class ImageCursors;
 // This class controls the visibility and the type of the cursor.
 // The cursor type can be locked so that the type stays the same
 // until it's unlocked.
-class CursorManager : public aura::client::CursorClient {
+class ASH_EXPORT CursorManager : public aura::client::CursorClient {
  public:
+  class ASH_EXPORT TestApi {

[sky, 2012/09/20 20:46:27]

Can you put this in a separate file so it isn't cluttering up CursorManager.

[mazda, 2012/09/20 21:13:40]

Changed as follows:
- only declare TestApi here.
- moved the implementation to cursor_manager_unittest.cc 

+   public:
+    explicit TestApi(CursorManager* cursor_manager);
+
+    gfx::NativeCursor GetCurrentCursor();
+    float GetDeviceScaleFactor();
+
+   private:
+    CursorManager* cursor_manager_;  // not owned
+
+    DISALLOW_COPY_AND_ASSIGN(TestApi);
+  };
+
   CursorManager();
   virtual ~CursorManager();