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

ash/display/display_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/display/display_controller.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
@@ skipping 163 matching lines @@
 };
 
 gfx::Display::Rotation GetStoredRotation(int64 id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).rotation();
 }
 
 float GetStoredUIScale(int64 id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).ui_scale();
 }
 
-void MoveMouseToInHostCoord(aura::RootWindow* root_window,
-                            int host_x,
-                            int host_y) {
-  gfx::Point move_point(host_x, host_y);
-  ui::MouseEvent mouseev(ui::ET_MOUSE_MOVED, move_point, move_point, 0);
-  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev);
-}
-
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
 TEST_F(DisplayControllerShutdownTest, Shutdown) {
   UpdateDisplay("444x333, 200x200");
 }
 
 TEST_F(DisplayControllerTest, SecondaryDisplayLayout) {
   TestObserver observer;
@@ skipping 506 matching lines @@
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   display_controller->SetOverscanInsets(display1.id(),
                                         gfx::Insets(10, 15, 20, 25));
   EXPECT_EQ("0,0 80x170", root_windows[0]->bounds().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("80,0 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
 
   aura::test::EventGenerator generator(root_windows[0]);
-  generator.MoveMouseTo(20, 25);
+  generator.MoveMouseToInHost(20, 25);
   EXPECT_EQ("5,15", event_handler.GetLocationAndReset());
 
   display_controller->ClearCustomOverscanInsets(display1.id());
   EXPECT_EQ("0,0 120x200", root_windows[0]->bounds().ToString());
   EXPECT_EQ("120,0 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
 
-  generator.MoveMouseTo(30, 20);
+  generator.MoveMouseToInHost(30, 20);
   EXPECT_EQ("30,20", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 #if defined(OS_WIN)
 // On Win8 bots, the host window can't be resized and
 // SetTransform updates the window using the orignal host window
 // size.
 #define MAYBE_Rotate DISABLED_Rotate
@@ skipping 18 matching lines @@
   UpdateDisplay("120x200,300x400*2");
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   int64 display2_id = ScreenAsh::GetSecondaryDisplay().id();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::test::EventGenerator generator1(root_windows[0]);
 
   EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("120,0 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
-  generator1.MoveMouseTo(50, 40);
+  generator1.MoveMouseToInHost(50, 40);
   EXPECT_EQ("50,40", event_handler.GetLocationAndReset());
   EXPECT_EQ(gfx::Display::ROTATE_0, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_0, GetStoredRotation(display2_id));
 
   display_manager->SetDisplayRotation(display1.id(),
                                       gfx::Display::ROTATE_90);
   EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("200,0 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
-  generator1.MoveMouseTo(50, 40);
+  generator1.MoveMouseToInHost(50, 40);
   EXPECT_EQ("40,69", event_handler.GetLocationAndReset());
   EXPECT_EQ(gfx::Display::ROTATE_90, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_0, GetStoredRotation(display2_id));
 
   DisplayLayout display_layout(DisplayLayout::BOTTOM, 50);
   display_controller->SetLayoutForCurrentDisplays(display_layout);
   EXPECT_EQ("50,120 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
 
   display_manager->SetDisplayRotation(display2_id,
                                       gfx::Display::ROTATE_270);
   EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString());
   EXPECT_EQ("50,120 200x150",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_90, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_270, GetStoredRotation(display2_id));
 
   aura::test::EventGenerator generator2(root_windows[1]);
-  generator2.MoveMouseTo(50, 40);
+  generator2.MoveMouseToInHost(50, 40);
   EXPECT_EQ("179,25", event_handler.GetLocationAndReset());
   display_manager->SetDisplayRotation(display1.id(),
                                       gfx::Display::ROTATE_180);
 
   EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString());
   EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString());
   // Dislay must share at least 100, so the x's offset becomes 20.
   EXPECT_EQ("20,200 200x150",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_180, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_270, GetStoredRotation(display2_id));
 
-  generator1.MoveMouseTo(50, 40);
+  generator1.MoveMouseToInHost(50, 40);
   EXPECT_EQ("69,159", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 TEST_F(DisplayControllerTest, MAYBE_ScaleRootWindow) {
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2@1.5,500x300");
 
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display::SetInternalDisplayId(display1.id());
 
   gfx::Display display2 = ScreenAsh::GetSecondaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 450x300", display1.bounds().ToString());
   EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString());
   EXPECT_EQ("450,0 500x300", display2.bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
   EXPECT_EQ(1.0f, GetStoredUIScale(display2.id()));
 
   aura::test::EventGenerator generator(root_windows[0]);
-  generator.MoveMouseTo(599, 200);
+  generator.MoveMouseToInHost(599, 200);
   EXPECT_EQ("449,150", event_handler.GetLocationAndReset());
 
   internal::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   display_manager->SetDisplayUIScale(display1.id(), 1.25f);
   display1 = Shell::GetScreen()->GetPrimaryDisplay();
   display2 = ScreenAsh::GetSecondaryDisplay();
   EXPECT_EQ("0,0 375x250", display1.bounds().ToString());
   EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString());
   EXPECT_EQ("375,0 500x300", display2.bounds().ToString());
@@ skipping 37 matching lines @@
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2/r@1.5");
 
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
   EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
-  MoveMouseToInHostCoord(root_windows[0], 0, 0);
+  aura::test::EventGenerator generator(root_windows[0]);
+  generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("0,449", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 0);
+  generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 399);
+  generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("299,0", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 0, 399);
+  generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("299,449", event_handler.GetLocationAndReset());
 
   UpdateDisplay("600x400*2/u@1.5");
   display1 = Shell::GetScreen()->GetPrimaryDisplay();
   root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 450x300", display1.bounds().ToString());
   EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
-  MoveMouseToInHostCoord(root_windows[0], 0, 0);
+  generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("449,299", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 0);
+  generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("0,299", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 399);
+  generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 0, 399);
+  generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("449,0", event_handler.GetLocationAndReset());
 
   UpdateDisplay("600x400*2/l@1.5");
   display1 = Shell::GetScreen()->GetPrimaryDisplay();
   root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
   EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
 
-  MoveMouseToInHostCoord(root_windows[0], 0, 0);
+  generator.MoveMouseToInHost(0, 0);
   EXPECT_EQ("299,0", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 0);
+  generator.MoveMouseToInHost(599, 0);
   EXPECT_EQ("299,449", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 599, 399);
+  generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("0,449", event_handler.GetLocationAndReset());
-  MoveMouseToInHostCoord(root_windows[0], 0, 399);
+  generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace test
 }  // namespace ash