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

ash/frame/caption_buttons/frame_size_button_unittest.cc

 // Copyright 2014 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/frame/caption_buttons/frame_size_button.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
@@ skipping 124 matching lines @@
   FrameCaptionButton* minimize_button_;
   FrameCaptionButton* size_button_;
   FrameCaptionButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameSizeButtonTest);
 };
 
 // Tests that pressing the left mouse button or tapping down on the size button
 // puts the button into the pressed state.
 TEST_F(FrameSizeButtonTest, PressedState) {
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_EQ(views::Button::STATE_NORMAL, size_button()->state());
 
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressTouchId(3);
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   generator.ReleaseTouchId(3);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(views::Button::STATE_NORMAL, size_button()->state());
 }
 
 // Tests that clicking on the size button toggles between the maximized and
 // normal state.
 TEST_F(FrameSizeButtonTest, ClickSizeButtonTogglesMaximize) {
   EXPECT_FALSE(window_state()->IsMaximized());
 
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.ClickLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(window_state()->IsMaximized());
 
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.ClickLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(window_state()->IsMaximized());
 
   generator.GestureTapAt(CenterPointInScreen(size_button()));
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(window_state()->IsMaximized());
 
   generator.GestureTapAt(CenterPointInScreen(size_button()));
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(window_state()->IsMaximized());
 }
 
 // Test that clicking + dragging to a button adjacent to the size button snaps
 // the window left or right.
 TEST_F(FrameSizeButtonTest, ButtonDrag) {
   EXPECT_TRUE(window_state()->IsNormalStateType());
 
   // 1) Test by dragging the mouse.
   // Snap right.
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   generator.MoveMouseTo(CenterPointInScreen(close_button()));
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(HasStateType(wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED));
 
   // Snap left.
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
@@ skipping 36 matching lines @@
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(HasStateType(wm::WINDOW_STATE_TYPE_LEFT_SNAPPED));
   ui::GestureConfiguration::set_default_radius(touch_default_radius);
 }
 
 // Test that clicking, dragging, and overshooting the minimize button a bit
 // horizontally still snaps the window left.
 TEST_F(FrameSizeButtonTest, SnapLeftOvershootMinimize) {
   EXPECT_TRUE(window_state()->IsNormalStateType());
 
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
 
   generator.PressLeftButton();
   // Move to the minimize button.
   generator.MoveMouseTo(CenterPointInScreen(minimize_button()));
   // Overshoot the minimize button.
   generator.MoveMouseBy(-minimize_button()->width(), 0);
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(HasStateType(wm::WINDOW_STATE_TYPE_LEFT_SNAPPED));
 }
 
 // Test that right clicking the size button has no effect.
 TEST_F(FrameSizeButtonTest, RightMouseButton) {
   EXPECT_TRUE(window_state()->IsNormalStateType());
 
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressRightButton();
   generator.ReleaseRightButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(window_state()->IsNormalStateType());
 }
 
 // Test that upon releasing the mouse button after having pressed the size
 // button
 // - The state of all the caption buttons is reset.
 // - The icon displayed by all of the caption buttons is reset.
 TEST_F(FrameSizeButtonTest, ResetButtonsAfterClick) {
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
   EXPECT_TRUE(AllButtonsInNormalState());
 
   // Pressing the size button should result in the size button being pressed and
   // the minimize and close button icons changing.
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   EXPECT_EQ(views::Button::STATE_NORMAL, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_NORMAL, close_button()->state());
   EXPECT_EQ(CAPTION_BUTTON_ICON_LEFT_SNAPPED, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_RIGHT_SNAPPED, close_button()->icon());
 
   // Dragging the mouse over the minimize button should hover the minimize
   // button and the minimize and close button icons should stay changed.
@@ skipping 50 matching lines @@
 
 // Test that the size button is pressed whenever the snap left/right buttons
 // are hovered.
 TEST_F(FrameSizeButtonTest, SizeButtonPressedWhenSnapButtonHovered) {
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
   EXPECT_TRUE(AllButtonsInNormalState());
 
   // Pressing the size button should result in the size button being pressed and
   // the minimize and close button icons changing.
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   EXPECT_EQ(views::Button::STATE_NORMAL, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_NORMAL, close_button()->state());
   EXPECT_EQ(CAPTION_BUTTON_ICON_LEFT_SNAPPED, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_RIGHT_SNAPPED, close_button()->icon());
 
   // Dragging the mouse over the minimize button (snap left button) should hover
   // the minimize button and keep the size button pressed.
@@ skipping 49 matching lines @@
             minimize_button()->GetBoundsInScreen().x());
 
   // Test initial state.
   EXPECT_TRUE(window_state()->IsNormalStateType());
   EXPECT_TRUE(AllButtonsInNormalState());
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
 
   // Pressing the size button should swap the icons of the minimize and close
   // buttons to icons for snapping right and for snapping left respectively.
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   EXPECT_EQ(views::Button::STATE_NORMAL, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_NORMAL, close_button()->state());
   EXPECT_EQ(CAPTION_BUTTON_ICON_RIGHT_SNAPPED, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_LEFT_SNAPPED, close_button()->icon());
 
   // Dragging over to the minimize button should press it.
   generator.MoveMouseTo(CenterPointInScreen(minimize_button()));
   EXPECT_EQ(views::Button::STATE_HOVERED, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_NORMAL, close_button()->state());
 
   // Releasing should snap the window right.
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(HasStateType(wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED));
 
   // None of the buttons should stay pressed and the buttons should have their
   // regular icons.
   EXPECT_TRUE(AllButtonsInNormalState());
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
 }
 
 }  // namespace test
 }  // namespace ash