Aura desktop: Show resize cursors again.

ash/wm/window_manager_unittest.cc

Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index 4217e64060ed4e1f8bc9509fa28e2e5a551439ed..fa78d3ffa2ffa0db7a24bd94cdabd0cc597132e2 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -7,10 +7,10 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
+#include "ash/wm/cursor_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
@@ -574,8 +574,8 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) {
 
   aura::shared::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
-  aura::CursorManager* cursor_manager =
-      aura::Env::GetInstance()->cursor_manager();
+  ash::CursorManager* cursor_manager =
+      ash::Shell::GetInstance()->cursor_manager();
 
   aura::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);