Aura desktop: Show resize cursors again.

ash/wm/power_button_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/wm/power_button_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/cursor_manager.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace ash {
 namespace test {
 namespace {
 bool cursor_visible() {
-  return aura::Env::GetInstance()->cursor_manager()->cursor_visible();
+  return ash::Shell::GetInstance()->cursor_manager()->cursor_visible();
 }
 }
 
 // Fake implementation of PowerButtonControllerDelegate that just logs requests
 // to lock the screen and shut down the device.
 class TestPowerButtonControllerDelegate : public PowerButtonControllerDelegate {
  public:
   TestPowerButtonControllerDelegate()
       : num_lock_requests_(0),
         num_shutdown_requests_(0) {}
@@ skipping 526 matching lines @@
 
   // After increasing the brightness to 10%, we should start the timer like
   // usual.
   controller_->OnScreenBrightnessChanged(10.0);
   controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   EXPECT_TRUE(test_api_->lock_timer_is_running());
 }
 
 }  // namespace test
 }  // namespace ash