[CleanUp] Add MoveMouseToInHost to aura::test::EventGenerator

ash/display/display_manager_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/display/display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace internal {
 
 using std::vector;
 using std::string;
 
@@ skipping 524 matching lines @@
   EXPECT_EQ("100x100",
             ash::Shell::GetPrimaryRootWindow()->GetHostSize().ToString());
 }
 
 TEST_F(DisplayManagerTest, EnsurePointerInDisplays) {
   UpdateDisplay("200x200,300x300");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   aura::Env* env = aura::Env::GetInstance();
 
+  aura::test::EventGenerator generator(root_windows[0]);
+
   // Set the initial position.
-  root_windows[0]->MoveCursorTo(gfx::Point(350, 150));
+  generator.MoveMouseToInHost(350, 150);
   EXPECT_EQ("350,150", env->last_mouse_location().ToString());
 
   // A mouse pointer will be inside 2nd display.
   UpdateDisplay("300x300,200x200");
   EXPECT_EQ("350,150", env->last_mouse_location().ToString());
 
   // A mouse pointer will be outside of displays and move to the
   // center of 2nd display.
   UpdateDisplay("300x300,100x100");
   EXPECT_EQ("350,50", env->last_mouse_location().ToString());
 
   // 2nd display was disconnected, but the mouse pointer says in the
   // 1st display.
   UpdateDisplay("400x400");
   EXPECT_EQ("350,50", env->last_mouse_location().ToString());
 
   // 1st display's resolution has changed, and the mouse pointer is
   // now outside. Move the mouse pointer to the center of 1st display.
   UpdateDisplay("300x300");
   EXPECT_EQ("150,150", env->last_mouse_location().ToString());
 
   // Move the mouse pointer to the bottom of 1st display.
-  root_windows[0]->MoveCursorTo(gfx::Point(150, 290));
+  generator.MoveMouseToInHost(150, 290);
   EXPECT_EQ("150,290", env->last_mouse_location().ToString());
 
   // The mouse pointer is outside and closest display is 1st one.
   UpdateDisplay("300x280,200x200");
   EXPECT_EQ("150,140", env->last_mouse_location().ToString());
 }
 
 TEST_F(DisplayManagerTest, EnsurePointerInDisplays_2ndOnLeft) {
   // Set the 2nd display on the left.
   DisplayController* display_controller =
@@ skipping 194 matching lines @@
 #else
 #define MAYBE_UpdateMouseCursorAfterRotateZoom UpdateMouseCursorAfterRotateZoom
 #endif
 
 TEST_F(DisplayManagerTest, MAYBE_UpdateMouseCursorAfterRotateZoom) {
   // Make sure just rotating will not change native location.
   UpdateDisplay("300x200,200x150");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::Env* env = aura::Env::GetInstance();
 
+  aura::test::EventGenerator generator1(root_windows[0]);
+  aura::test::EventGenerator generator2(root_windows[1]);
+
   // Test on 1st display.
-  root_windows[0]->MoveCursorTo(gfx::Point(150, 50));
+  generator1.MoveMouseToInHost(150, 50);
   EXPECT_EQ("150,50", env->last_mouse_location().ToString());
   UpdateDisplay("300x200/r,200x150");
   EXPECT_EQ("50,149", env->last_mouse_location().ToString());
 
   // Test on 2nd display.
-  root_windows[1]->MoveCursorTo(gfx::Point(50, 100));
+  generator2.MoveMouseToInHost(50, 100);
   EXPECT_EQ("250,100", env->last_mouse_location().ToString());
   UpdateDisplay("300x200/r,200x150/l");
   EXPECT_EQ("249,50", env->last_mouse_location().ToString());
 
   // Make sure just zooming will not change native location.
   UpdateDisplay("600x400*2,400x300");
 
   // Test on 1st display.
-  root_windows[0]->MoveCursorTo(gfx::Point(100, 150));
+  generator1.MoveMouseToInHost(200, 300);
   EXPECT_EQ("100,150", env->last_mouse_location().ToString());
   UpdateDisplay("600x400*2@1.5,400x300");
   EXPECT_EQ("150,225", env->last_mouse_location().ToString());
 
   // Test on 2nd display.
   UpdateDisplay("600x400,400x300*2");
-  root_windows[1]->MoveCursorTo(gfx::Point(100, 50));
+  generator2.MoveMouseToInHost(200, 100);
   EXPECT_EQ("700,50", env->last_mouse_location().ToString());
   UpdateDisplay("600x400,400x300*2@1.5");
   EXPECT_EQ("750,75", env->last_mouse_location().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash