Move cursor when it's hidden so that UX can update correctly

ui/aura/root_window_unittest.cc

Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 48b3743fd5105f797ef9865561a09189ba3fa537..bb8c70155eda453139389ac227d24cdb22a848ee 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -147,6 +147,47 @@ TEST_F(RootWindowTest, OnHostMouseEvent) {
   EXPECT_TRUE(delegate1->mouse_event_flags() & ui::EF_IS_NON_CLIENT);
 }
 
+#if defined(OS_WIN)
+// Temporarily disabled for windows. See crbug.com/112222.
+TEST_F(RootWindowTest, DISABLED_HideCursor) {
+#else
+TEST_F(RootWindowTest, HideCursor) {
+#endif  // defined(OS_WIN)
+  scoped_ptr<NonClientDelegate> delegate(new NonClientDelegate());
+  const int kWindowWidth = 123;
+  const int kWindowHeight = 45;
+  gfx::Rect bounds(100, 200, kWindowWidth, kWindowHeight);
+  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+      delegate.get(), -1234, bounds, NULL));
+  aura::Window* window_ptr = &*window;
+
+  root_window()->ShowCursor(true);
+  // Send a mouse event to window.
+  gfx::Point point(101, 201);
+  gfx::Point local_point;
+  ui::MouseEvent event(ui::ET_MOUSE_MOVED, point, point, 0);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(&event);
+
+  // Location was in window.
+  local_point = delegate->mouse_event_location();
+  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
+  EXPECT_TRUE(window->bounds().Contains(local_point));
+
+  // Location is now out of window.
+  root_window()->ShowCursor(false);
+  RunAllPendingInMessageLoop();
+  local_point = delegate->mouse_event_location();
+  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
+  EXPECT_FALSE(window->bounds().Contains(local_point));
+
+  // Location is back in window.
+  root_window()->ShowCursor(true);
+  RunAllPendingInMessageLoop();
+  local_point = delegate->mouse_event_location();
+  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
+  EXPECT_TRUE(window->bounds().Contains(local_point));
+}
+
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_F(RootWindowTest, MouseButtonState) {