Fix cursor getting invisible after moving a window.

ash/wm/cursor_manager.cc

Index: ash/wm/cursor_manager.cc
diff --git a/ash/wm/cursor_manager.cc b/ash/wm/cursor_manager.cc
index 3afee4b20d848e9d1b29b0ecce034e2d228d4523..1e39f307121a9c7472a5884df3a6e07e22c4078f 100644
--- a/ash/wm/cursor_manager.cc
+++ b/ash/wm/cursor_manager.cc
@@ -12,6 +12,18 @@
 
 namespace ash {
 
+CursorManager::TestApi::TestApi(CursorManager* cursor_manager)
+    : cursor_manager_(cursor_manager) {
+}
+
+gfx::NativeCursor CursorManager::TestApi::current_cursor() {
+  return cursor_manager_->current_cursor_;
+}
+
+float CursorManager::TestApi::GetDeviceScaleFactor() {
+  return cursor_manager_->image_cursors_->GetDeviceScaleFactor();
+}
+
 CursorManager::CursorManager()
     : delegate_(NULL),
       cursor_lock_count_(0),
@@ -36,7 +48,7 @@ void CursorManager::UnlockCursor() {
     if (did_cursor_change_) {
       did_cursor_change_ = false;
       if (delegate_)
-        delegate_->SetCursor(cursor_to_set_on_unlock_);
+        SetCursorInternal(cursor_to_set_on_unlock_);
     }
     did_cursor_change_ = false;
     cursor_to_set_on_unlock_ = gfx::kNullCursor;