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

ash/wm/window_modality_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 "ui/wm/core/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/child_modal_window.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.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/ui_base_types.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/test/capture_tracking_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 typedef test::AshTestBase WindowModalityControllerTest;
 
 namespace {
 
@@ skipping 154 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d, -1,
       gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d, -11,
       gfx::Rect(20, 20, 50, 50)));
 
   ::wm::AddTransientChild(w1.get(), w11.get());
 
   {
     // Clicking a point within w1 should activate that window.
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         gfx::Point(10, 10));
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   }
 
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   {
     // Clicking a point within w1 should activate w11.
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         gfx::Point(10, 10));
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
 }
 
 // Events on modal parent activate.
 TEST_F(WindowModalityControllerTest, EventsForEclipsedWindows) {
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d, -1,
       gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d, -11,
       gfx::Rect(20, 20, 50, 50)));
   ::wm::AddTransientChild(w1.get(), w11.get());
   scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(&d, -2,
       gfx::Rect(0, 0, 50, 50)));
 
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   // Partially eclipse w1 with w2.
   wm::ActivateWindow(w2.get());
   {
     // Clicking a point on w1 that is not eclipsed by w2.
-    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                         gfx::Point(90, 90));
+    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(90, 90));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
 }
 
 // Creates windows w1 and non activatiable child w11. Creates transient window
 // w2 and adds it as a transeint child of w1. Ensures that w2 is parented to
 // the parent of w1, and that GetModalTransient(w11) returns w2.
 TEST_F(WindowModalityControllerTest, GetModalTransient) {
   aura::test::TestWindowDelegate d;
@@ skipping 31 matching lines @@
       NULL, Shell::GetPrimaryRootWindow());
   scoped_ptr<aura::Window> widget_window(widget->GetNativeView());
   views::test::CaptureTrackingView* view = new views::test::CaptureTrackingView;
   widget->client_view()->AddChildView(view);
   widget->SetBounds(gfx::Rect(0, 0, 200, 200));
   view->SetBoundsRect(widget->client_view()->GetLocalBounds());
   widget->Show();
 
   gfx::Point center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &center);
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), center);
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), center);
   generator.PressLeftButton();
   EXPECT_TRUE(view->got_press());
 
   views::Widget* modal_widget =
       views::Widget::CreateWindowWithParent(NULL, widget->GetNativeView());
   scoped_ptr<aura::Window> modal_window(modal_widget->GetNativeView());
   modal_window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   views::test::CaptureTrackingView* modal_view =
       new views::test::CaptureTrackingView;
   modal_widget->client_view()->AddChildView(modal_view);
@@ skipping 50 matching lines @@
 };
 
 // Modality should prevent events from being passed to the transient parent.
 TEST_F(WindowModalityControllerTest, TouchEvent) {
   TouchTrackerWindowDelegate d1;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(&d1,
       -1, gfx::Rect(0, 0, 100, 100)));
   TouchTrackerWindowDelegate d11;
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d11,
       -11, gfx::Rect(20, 20, 50, 50)));
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(10, 10));
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     gfx::Point(10, 10));
 
   ::wm::AddTransientChild(w1.get(), w11.get());
   d1.reset();
   d11.reset();
 
   {
     // Clicking a point within w1 should activate that window.
     generator.PressMoveAndReleaseTouchTo(gfx::Point(10, 10));
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
     EXPECT_TRUE(d1.received_touch());
@@ skipping 110 matching lines @@
 
   EXPECT_TRUE(wm::IsActiveWindow(child));
   EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
   EXPECT_FALSE(wm::IsActiveWindow(parent));
 
   EXPECT_TRUE(child->HasFocus());
   EXPECT_FALSE(modal_parent->HasFocus());
   EXPECT_FALSE(parent->HasFocus());
 
   {
-    aura::test::EventGenerator generator(
+    ui::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         parent->bounds().origin() +
             gfx::Vector2d(10, parent->bounds().height() - 10));
     generator.ClickLeftButton();
     generator.ClickLeftButton();
 
     EXPECT_TRUE(wm::IsActiveWindow(child));
     EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
     EXPECT_FALSE(wm::IsActiveWindow(parent));
 
     EXPECT_TRUE(child->HasFocus());
     EXPECT_FALSE(modal_parent->HasFocus());
     EXPECT_FALSE(parent->HasFocus());
   }
 
   {
-    aura::test::EventGenerator generator(
+    ui::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         parent->bounds().origin() + gfx::Vector2d(10, 10));
     generator.ClickLeftButton();
 
     EXPECT_FALSE(wm::IsActiveWindow(child));
     EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
     EXPECT_TRUE(wm::IsActiveWindow(parent));
 
     EXPECT_FALSE(child->HasFocus());
     EXPECT_FALSE(modal_parent->HasFocus());
     EXPECT_TRUE(parent->HasFocus());
   }
 
   {
-    aura::test::EventGenerator generator(
+    ui::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         child->bounds().origin() + gfx::Vector2d(10, 10));
     generator.ClickLeftButton();
 
     EXPECT_TRUE(wm::IsActiveWindow(child));
     EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
     EXPECT_FALSE(wm::IsActiveWindow(parent));
 
     EXPECT_TRUE(child->HasFocus());
     EXPECT_FALSE(modal_parent->HasFocus());
@@ skipping 52 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 }  // namespace ash