Implement cursor compositing mode on Ash

ash/test/mirror_window_test_api.cc

Index: ash/test/mirror_window_test_api.cc
diff --git a/ash/test/mirror_window_test_api.cc b/ash/test/mirror_window_test_api.cc
index d8c7705f1bcaba7dec01ad434b4657451869eb5d..e98eb7999d6d5d931041a8312e8bac1feae529af 100644
--- a/ash/test/mirror_window_test_api.cc
+++ b/ash/test/mirror_window_test_api.cc
@@ -4,6 +4,7 @@
 
 #include "ash/test/mirror_window_test_api.h"
 
+#include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/shell.h"
@@ -20,17 +21,17 @@ const aura::RootWindow* MirrorWindowTestApi::GetRootWindow() const {
 
 int MirrorWindowTestApi::GetCurrentCursorType() const {
   return Shell::GetInstance()->display_controller()->
-      mirror_window_controller()->current_cursor_type_;
+      cursor_window_controller()->current_cursor_type_;
 }
 
 const gfx::Point& MirrorWindowTestApi::GetCursorHotPoint() const {
   return Shell::GetInstance()->display_controller()->
-      mirror_window_controller()->hot_point_;
+      cursor_window_controller()->hot_point_;
 }
 
 const aura::Window* MirrorWindowTestApi::GetCursorWindow() const {
   return Shell::GetInstance()->display_controller()->
-      mirror_window_controller()->cursor_window_;
+      cursor_window_controller()->cursor_window_.get();
 }
 
 scoped_ptr<aura::RootWindowTransformer>