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

ash/wm/resize_shadow_and_cursor_unittest.cc

 // Copyright 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/ash_constants.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/resize_shadow.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 // views::WidgetDelegate which uses ash::CustomFrameViewAsh.
 class TestWidgetDelegate : public views::WidgetDelegateView {
@@ skipping 81 matching lines @@
 
  private:
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ResizeShadowAndCursorTest);
 };
 
 // Test whether the resize shadows are visible and the cursor type based on the
 // mouse's position.
 TEST_F(ResizeShadowAndCursorTest, MouseHover) {
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(50, 50);
   EXPECT_FALSE(HasResizeShadow());
   EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
 
   generator.MoveMouseTo(gfx::Point(50, 0));
   EXPECT_EQ(HTTOP, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorNorthResize, GetCurrentCursorType());
 
@@ skipping 22 matching lines @@
   EXPECT_EQ(ui::kCursorSouthResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100 - ash::kResizeInsideBoundsSize - 10);
   EXPECT_FALSE(HasResizeShadow());
   EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
 }
 
 // Test that the resize shadows stay visible and that the cursor stays the same
 // as long as a user is resizing a window.
 TEST_F(ResizeShadowAndCursorTest, MouseDrag) {
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
   gfx::Size initial_size(window()->bounds().size());
 
   generator.MoveMouseTo(200, 50);
   generator.PressLeftButton();
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(210, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
 
   generator.ReleaseLeftButton();
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
 
   gfx::Size new_size(window()->bounds().size());
   EXPECT_NE(new_size.ToString(), initial_size.ToString());
 }
 
 // Test that the resize shadows stay visible while resizing a window via touch.
 TEST_F(ResizeShadowAndCursorTest, Touch) {
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   int start_x = 200 + ash::kResizeOutsideBoundsSize - 1;
   int start_y = 100 + ash::kResizeOutsideBoundsSize - 1;
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(start_x, start_y),
       gfx::Point(start_x + 50, start_y + 50),
       base::TimeDelta::FromMilliseconds(200),
       3,
       base::Bind(&ResizeShadowAndCursorTest::ProcessBottomRightResizeGesture,
                  base::Unretained(this)));
 }
 
 // Test that the resize shadows are not visible and that the default cursor is
 // used when the window is maximized.
 TEST_F(ResizeShadowAndCursorTest, MaximizeRestore) {
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(200, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
   generator.MoveMouseTo(200 - ash::kResizeInsideBoundsSize, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
 
   ash::wm::GetWindowState(window())->Maximize();
   gfx::Rect bounds(window()->GetBoundsInRootWindow());
   gfx::Point right_center(bounds.right() - 1,
                           (bounds.y() + bounds.bottom()) / 2);
   generator.MoveMouseTo(right_center);
   EXPECT_FALSE(HasResizeShadow());
   EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
 
   ash::wm::GetWindowState(window())->Restore();
   generator.MoveMouseTo(200, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
   generator.MoveMouseTo(200 - ash::kResizeInsideBoundsSize, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
   EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
 }
 
 }  // namespace test
 }  // namespace ash