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

ash/wm/toplevel_window_event_handler_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/wm/toplevel_window_event_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/resize_shadow.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/window_move_client.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
 #endif
 #endif
@@ skipping 35 matching lines @@
     w1->Init(aura::WINDOW_LAYER_TEXTURED);
     aura::Window* parent = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(), kShellWindowId_AlwaysOnTopContainer);
     parent->AddChild(w1);
     w1->SetBounds(gfx::Rect(0, 0, 100, 100));
     w1->Show();
     return w1;
   }
 
   void DragFromCenterBy(aura::Window* window, int dx, int dy) {
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
     generator.DragMouseBy(dx, dy);
   }
 
   void TouchDragFromCenterBy(aura::Window* window, int dx, int dy) {
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), window);
     generator.PressMoveAndReleaseTouchBy(dx, dy);
   }
 
   scoped_ptr<ToplevelWindowEventHandler> handler_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ToplevelWindowEventHandlerTest);
 };
 
 }
@@ skipping 24 matching lines @@
   EXPECT_EQ(gfx::Size(200, 200).ToString(), w1->bounds().size().ToString());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, GrowBox) {
   scoped_ptr<aura::Window> w1(CreateWindow(HTGROWBOX));
   TestWindowDelegate* window_delegate =
       static_cast<TestWindowDelegate*>(w1->delegate());
   window_delegate->set_minimum_size(gfx::Size(40, 40));
 
   gfx::Point position = w1->bounds().origin();
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseToCenterOf(w1.get());
   generator.DragMouseBy(100, 100);
   // Position should not have changed.
   EXPECT_EQ(position.ToString(), w1->bounds().origin().ToString());
   // Size should have increased by 100,100.
   EXPECT_EQ(gfx::Size(200, 200).ToString(), w1->bounds().size().ToString());
 
   // Shrink the wnidow by (-100, -100).
   generator.DragMouseBy(-100, -100);
   // Position should not have changed.
@@ skipping 223 matching lines @@
   EXPECT_EQ(size.ToString(), w1->bounds().size().ToString());
 
   TouchDragFromCenterBy(w1.get(), 100, 100);
   EXPECT_EQ("0,0", w1->bounds().origin().ToString());
   EXPECT_EQ(size.ToString(), w1->bounds().size().ToString());
 }
 
 // Verifies we don't let windows drag to a -y location.
 TEST_F(ToplevelWindowEventHandlerTest, DontDragToNegativeY) {
   scoped_ptr<aura::Window> target(CreateWindow(HTTOP));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   generator.MoveMouseTo(0, 5);
   generator.DragMouseBy(0, -5);
   // The y location and height should not have changed.
   EXPECT_EQ(0, target->bounds().y());
   EXPECT_EQ(100, target->bounds().height());
 }
 
 // Verifies we don't let windows go bigger than the display width.
 TEST_F(ToplevelWindowEventHandlerTest, DontGotWiderThanScreen) {
   scoped_ptr<aura::Window> target(CreateWindow(HTRIGHT));
   gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
       target.get()).bounds();
   DragFromCenterBy(target.get(), work_area.width() * 2, 0);
   // The y location and height should not have changed.
   EXPECT_EQ(work_area.width(), target->bounds().width());
 }
 
 // Verifies that touch-gestures drag the window correctly.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
   scoped_ptr<aura::Window> target(
       CreateTestWindowInShellWithDelegate(
           new TestWindowDelegate(HTCAPTION),
           0,
           gfx::Rect(0, 0, 100, 100)));
   wm::WindowState* window_state = wm::GetWindowState(target.get());
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
 
   gfx::Point end = location;
 
   // Snap right;
   end.Offset(100, 0);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
@@ skipping 58 matching lines @@
       Shell::GetInstance()->lock_state_controller();
   state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
   state_controller->OnLockStateChanged(false);
   SetUserLoggedIn(false);
 
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
   aura::Window* lock =
       RootWindowController::ForWindow(target.get())
           ->GetContainer(kShellWindowId_LockSystemModalContainer);
   lock->AddChild(target.get());
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
 
   gfx::Point end = location;
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(wm::GetWindowState(target.get())->IsMinimized());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragToRestore) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithDelegate(
           new TestWindowDelegate(HTCAPTION),
           0,
           gfx::Rect(10, 20, 30, 40)));
   window->Show();
   wm::WindowState* window_state = wm::GetWindowState(window.get());
   window_state->Activate();
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       window.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     window.get());
   gfx::Rect old_bounds = window->bounds();
   gfx::Point location, end;
   end = location = window->GetBoundsInRootWindow().CenterPoint();
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), window->bounds().ToString());
   EXPECT_TRUE(window_state->IsMinimized());
   EXPECT_TRUE(window_state->unminimize_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
             window_state->GetRestoreBoundsInScreen().ToString());
 }
 
 // Tests that an unresizable window cannot be dragged or snapped using gestures.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragForUnresizableWindow) {
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
   wm::WindowState* window_state = wm::GetWindowState(target.get());
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
 
   target->SetProperty(aura::client::kCanResizeKey, false);
 
   gfx::Point end = location;
 
   // Try to snap right. The window is not resizable. So it should not snap.
   end.Offset(100, 0);
   generator.GestureScrollSequence(location, end,
@@ skipping 33 matching lines @@
   scoped_ptr<aura::Window> target(
       CreateTestWindowInShellWithDelegate(
           new TestWindowDelegate(HTCAPTION),
           0,
           gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> notmoved(
       CreateTestWindowInShellWithDelegate(
           new TestWindowDelegate(HTCAPTION),
           1, gfx::Rect(100, 0, 100, 100)));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
 
   // Send some touch events to start dragging |target|.
   generator.MoveTouch(location);
   generator.PressTouch();
   location.Offset(40, 5);
   generator.MoveTouch(location);
 
   // Try to drag |notmoved| window. This should not move the window.
   {
     gfx::Rect bounds = notmoved->bounds();
-    aura::test::EventGenerator gen(Shell::GetPrimaryRootWindow(),
-                                   notmoved.get());
+    ui::test::EventGenerator gen(Shell::GetPrimaryRootWindow(), notmoved.get());
     gfx::Point start = notmoved->bounds().origin() + gfx::Vector2d(10, 10);
     gfx::Point end = start + gfx::Vector2d(100, 10);
     gen.GestureScrollSequence(start, end,
         base::TimeDelta::FromMilliseconds(10),
         10);
     EXPECT_EQ(bounds.ToString(), notmoved->bounds().ToString());
   }
 }
 
 // Verifies pressing escape resets the bounds to the original bounds.
 // Disabled crbug.com/166219.
 #if defined(OS_WIN)
 #define MAYBE_EscapeReverts DISABLED_EscapeReverts
 #else
 #define MAYBE_EscapeReverts EscapeReverts
 #endif
 TEST_F(ToplevelWindowEventHandlerTest, MAYBE_EscapeReverts) {
   scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMRIGHT));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       target.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     target.get());
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 11);
 
   // Execute any scheduled draws so that pending mouse events are processed.
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ("0,0 110x111", target->bounds().ToString());
   generator.PressKey(ui::VKEY_ESCAPE, 0);
   generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
   EXPECT_EQ("0,0 100x100", target->bounds().ToString());
 }
 
 // Verifies window minimization/maximization completes drag.
 // Disabled crbug.com/166219.
 #if defined(OS_WIN)
 #define MAYBE_MinimizeMaximizeCompletes DISABLED_MinimizeMaximizeCompletes
 #else
 #define MAYBE_MinimizeMaximizeCompletes MinimizeMaximizeCompletes
 #endif
 TEST_F(ToplevelWindowEventHandlerTest, MAYBE_MinimizeMaximizeCompletes) {
   // Once window is minimized, window dragging completes.
   {
     scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
     target->Focus();
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         target.get());
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       target.get());
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
     wm::WindowState* window_state = wm::GetWindowState(target.get());
     window_state->Minimize();
     window_state->Restore();
 
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
   }
 
   // Once window is maximized, window dragging completes.
   {
     scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
     target->Focus();
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         target.get());
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       target.get());
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
     wm::WindowState* window_state = wm::GetWindowState(target.get());
     window_state->Maximize();
     window_state->Restore();
 
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
   }
 }
 
 // Verifies that a drag cannot be started via
 // aura::client::WindowMoveClient::RunMoveLoop() while another drag is already
 // in progress.
 TEST_F(ToplevelWindowEventHandlerTest, RunMoveLoopFailsDuringInProgressDrag) {
   scoped_ptr<aura::Window> window1(CreateWindow(HTCAPTION));
   EXPECT_EQ("0,0 100x100", window1->bounds().ToString());
   scoped_ptr<aura::Window> window2(CreateWindow(HTCAPTION));
 
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       window1.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     window1.get());
   window1->Focus();
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 11);
   EXPECT_EQ("10,11 100x100", window1->bounds().ToString());
 
   aura::client::WindowMoveClient* move_client =
       aura::client::GetWindowMoveClient(window2->GetRootWindow());
   EXPECT_EQ(aura::client::MOVE_CANCELED,
             move_client->RunMoveLoop(window2.get(), gfx::Vector2d(),
                 aura::client::WINDOW_MOVE_SOURCE_MOUSE));
 
   generator.ReleaseLeftButton();
   EXPECT_EQ("10,11 100x100", window1->bounds().ToString());
 }
 
 namespace {
 
-void SendMouseReleaseAndReleaseCapture(aura::test::EventGenerator* generator,
+void SendMouseReleaseAndReleaseCapture(ui::test::EventGenerator* generator,
                                        aura::Window* window) {
   generator->ReleaseLeftButton();
   window->ReleaseCapture();
 }
 
 }  // namespace
 
 // Test that a drag is successful even if ET_MOUSE_CAPTURE_CHANGED is sent
 // immediately after the mouse release. views::Widget has this behavior.
 TEST_F(ToplevelWindowEventHandlerTest, CaptureLossAfterMouseRelease) {
   scoped_ptr<aura::Window> window(CreateWindow(HTNOWHERE));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       window.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     window.get());
   generator.PressLeftButton();
   window->SetCapture();
 
   aura::client::WindowMoveClient* move_client =
       aura::client::GetWindowMoveClient(window->GetRootWindow());
   base::MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       base::Bind(&SendMouseReleaseAndReleaseCapture,
                  base::Unretained(&generator),
                  base::Unretained(window.get())));
   EXPECT_EQ(aura::client::MOVE_SUCCESSFUL,
             move_client->RunMoveLoop(window.get(), gfx::Vector2d(),
                 aura::client::WINDOW_MOVE_SOURCE_MOUSE));
 }
 
 // Showing the resize shadows when the mouse is over the window edges is tested
 // in resize_shadow_and_cursor_test.cc
 
 }  // namespace test
 }  // namespace ash