aura: Fix a couple of drag drop issues:

ash/drag_drop/drag_drop_controller_unittest.cc

 // 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.
 
 #include "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/location.h"
 #include "base/utf_string_conversions.h"
@@ skipping 102 matching lines @@
   }
 
   void Reset() {
     drag_start_received_ = false;
     num_drag_updates_ = 0;
     drop_received_ = false;
     drag_canceled_ = false;
     drag_string_.clear();
   }
 
-  bool drag_start_received_;
-  int num_drag_updates_;
-  bool drop_received_;
-  bool drag_canceled_;
-  string16 drag_string_;
-
- private:
   int StartDragAndDrop(const ui::OSExchangeData& data,
                        const gfx::Point& location,
                        int operation) OVERRIDE {
     drag_start_received_ = true;
     data.GetString(&drag_string_);
     return DragDropController::StartDragAndDrop(data, location, operation);
   }
 
+  void DragCancel() OVERRIDE {
+    DragDropController::DragCancel();
+    drag_canceled_ = true;
+  }
+
+  bool drag_start_received_;
+  int num_drag_updates_;
+  bool drop_received_;
+  bool drag_canceled_;
+  string16 drag_string_;
+
+ private:
   void DragUpdate(aura::Window* target,
                   const aura::LocatedEvent& event) OVERRIDE {
     DragDropController::DragUpdate(target, event);
     num_drag_updates_++;
   }
 
   void Drop(aura::Window* target, const aura::LocatedEvent& event) OVERRIDE {
     DragDropController::Drop(target, event);
     drop_received_ = true;
   }
 
-  void DragCancel() OVERRIDE {
-    DragDropController::DragCancel();
-    drag_canceled_ = true;
-  }
-
   DISALLOW_COPY_AND_ASSIGN(TestDragDropController);
 };
 
 class TestNativeWidgetAura : public views::NativeWidgetAura {
  public:
   explicit TestNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate)
       : NativeWidgetAura(delegate),
         check_if_capture_lost_(false) {
   }
 
@@ skipping 500 matching lines @@
       drag_drop_controller_->drag_string_);
 
   EXPECT_EQ(1, drag_view->num_drag_enters_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_view->num_drag_updates_);
   EXPECT_EQ(0, drag_view->num_drops_);
   EXPECT_EQ(1, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
+TEST_F(DragDropControllerTest, LockCursorWhileInDrag) {
+  ui::OSExchangeData data;
+  drag_drop_controller_->StartDragAndDrop(data, gfx::Point(), 0);
+
+  // We should not be able to change cursor
+  EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->is_cursor_locked());
+  EXPECT_FALSE(Shell::GetPrimaryRootWindow()->last_cursor() ==
+      ui::kCursorProgress);
+  ash::Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorProgress);
+  EXPECT_FALSE(Shell::GetPrimaryRootWindow()->last_cursor() ==
+      ui::kCursorProgress);
+
+  drag_drop_controller_->DragCancel();
+
+  // Now we can change cursor
+  EXPECT_FALSE(ash::Shell::GetInstance()->cursor_manager()->is_cursor_locked());
+  EXPECT_FALSE(Shell::GetPrimaryRootWindow()->last_cursor() ==
+      ui::kCursorProgress);
+  ash::Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorProgress);
+  EXPECT_TRUE(Shell::GetPrimaryRootWindow()->last_cursor() ==
+      ui::kCursorProgress);
+}
+
 }  // namespace test
 }  // namespace aura