Cleanups for aura/test/event_generator.h (resolve TODOs)

ash/display/mirror_window_controller_unittest.cc

 // Copyright (c) 2013 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/mirror_window_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
+#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
 namespace {
 DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
   DisplayInfo info(id, base::StringPrintf("x-%d", static_cast<int>(id)), false);
   info.SetBounds(bounds);
   return info;
 }
 
@@ skipping 49 matching lines @@
       &test_window_delegate,
       0,
       gfx::Rect(50, 50, 100, 100),
       root));
   window->Show();
   window->SetName("foo");
 
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
-  aura::test::EventGenerator generator(root);
+  ui::test::EventGenerator generator(root);
   generator.MoveMouseTo(10, 10);
 
   // Test if cursor movement is propertly reflected in mirror window.
   gfx::Point hot_point = test_api.GetCursorHotPoint();
   gfx::Point cursor_window_origin =
       test_api.GetCursorWindow()->bounds().origin();
   EXPECT_EQ("4,4", hot_point.ToString());
   EXPECT_EQ(10 - hot_point.x(), cursor_window_origin.x());
   EXPECT_EQ(10 - hot_point.y(), cursor_window_origin.y());
   EXPECT_EQ(ui::kCursorNull, test_api.GetCurrentCursorType());
@@ skipping 36 matching lines @@
       &test_window_delegate,
       0,
       gfx::Rect(50, 50, 100, 100),
       root));
   window->Show();
   window->SetName("foo");
 
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
-  aura::test::EventGenerator generator(root);
+  ui::test::EventGenerator generator(root);
   generator.MoveMouseToInHost(100, 100);
 
   // Test if cursor movement is propertly reflected in mirror window.
   gfx::Point hot_point = test_api.GetCursorHotPoint();
   gfx::Point cursor_window_origin =
       test_api.GetCursorWindow()->bounds().origin();
   EXPECT_EQ("11,12", hot_point.ToString());
   EXPECT_EQ(100 - hot_point.x(), cursor_window_origin.x());
   EXPECT_EQ(100 - hot_point.y(), cursor_window_origin.y());
   EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
@@ skipping 35 matching lines @@
 // coordinates.
 TEST_F(MirrorWindowControllerTest, MAYBE_MirrorCursorLocations) {
   test::MirrorWindowTestApi test_api;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetSecondDisplayMode(DisplayManager::MIRRORING);
 
   // Test with device scale factor.
   UpdateDisplay("400x600*2,400x600");
 
   aura::Window* root = Shell::GetInstance()->GetPrimaryRootWindow();
-  aura::test::EventGenerator generator(root);
+  ui::test::EventGenerator generator(root);
   generator.MoveMouseToInHost(10, 20);
 
   gfx::Point hot_point = test_api.GetCursorHotPoint();
   EXPECT_EQ("8,9", hot_point.ToString());
   gfx::Point cursor_window_origin =
       test_api.GetCursorWindow()->bounds().origin();
   EXPECT_EQ(10 - hot_point.x(), cursor_window_origin.x());
   EXPECT_EQ(20 - hot_point.y(), cursor_window_origin.y());
 
   // Test with ui scale
@@ skipping 66 matching lines @@
 
 TEST_F(MirrorOnBootTest, MAYBE_MirrorOnBoot) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   EXPECT_TRUE(display_manager->IsMirrored());
   RunAllPendingInMessageLoop();
   test::MirrorWindowTestApi test_api;
   EXPECT_TRUE(test_api.GetHost());
 }
 
 }  // namespace ash