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

ash/wm/overview/window_selector_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 <algorithm>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 17 matching lines @@
 #include "ash/wm/wm_event.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.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/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_delegate.h"
 
 namespace ash {
 namespace {
@@ skipping 109 matching lines @@
     gfx::Transform transform;
     if (!window->layer()->GetTargetTransformRelativeTo(root->layer(),
                                                        &transform)) {
       return gfx::RectF();
     }
     transform.TransformRect(&bounds);
     return bounds;
   }
 
   void ClickWindow(aura::Window* window) {
-    aura::test::EventGenerator event_generator(window->GetRootWindow(), window);
+    ui::test::EventGenerator event_generator(window->GetRootWindow(), window);
     gfx::RectF target = GetTransformedBounds(window);
     event_generator.ClickLeftButton();
   }
 
   void SendKey(ui::KeyboardCode key) {
-      aura::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
+    ui::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
       event_generator.PressKey(key, 0);
       event_generator.ReleaseKey(key, 0);
   }
 
   bool IsSelecting() {
     return ash::Shell::GetInstance()->window_selector_controller()->
         IsSelecting();
   }
 
   aura::Window* GetFocusedWindow() {
@@ skipping 124 matching lines @@
 
 // Tests selecting a window by tapping on it.
 TEST_F(WindowSelectorTest, BasicGesture) {
   gfx::Rect bounds(0, 0, 400, 400);
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
   wm::ActivateWindow(window1.get());
   EXPECT_EQ(window1.get(), GetFocusedWindow());
   ToggleOverview();
   EXPECT_EQ(text_filter_widget()->GetNativeWindow(), GetFocusedWindow());
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       window2.get());
+  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                     window2.get());
   generator.GestureTapAt(gfx::ToEnclosingRect(
       GetTransformedTargetBounds(window2.get())).CenterPoint());
   EXPECT_EQ(window2.get(), GetFocusedWindow());
 }
 
 // Tests that a window does not receive located events when in overview mode.
 TEST_F(WindowSelectorTest, WindowDoesNotReceiveEvents) {
   gfx::Rect window_bounds(20, 10, 200, 300);
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window(CreateWindow(window_bounds));
@@ skipping 34 matching lines @@
   params.bounds = gfx::Rect(0, 0, 400, 400);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = window1->parent();
   widget->Init(params);
   widget->Show();
   ToggleOverview();
 
   aura::Window* window2 = widget->GetNativeWindow();
   gfx::RectF bounds = GetTransformedBoundsInRootWindow(window2);
   gfx::Point point(bounds.top_right().x() - 1, bounds.top_right().y() - 1);
-  aura::test::EventGenerator event_generator(window2->GetRootWindow(), point);
+  ui::test::EventGenerator event_generator(window2->GetRootWindow(), point);
 
   EXPECT_FALSE(widget->IsClosed());
   event_generator.ClickLeftButton();
   EXPECT_TRUE(widget->IsClosed());
 }
 
 // Tests entering overview mode with two windows and selecting one.
 TEST_F(WindowSelectorTest, FullscreenWindow) {
   gfx::Rect bounds(0, 0, 400, 400);
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
@@ skipping 615 matching lines @@
   aura::Window* window2 = widget2->GetNativeWindow();
   base::string16 panel1_title = base::UTF8ToUTF16("Panel 1");
   base::string16 panel2_title = base::UTF8ToUTF16("Panel 2");
   window1->SetTitle(panel1_title);
   window2->SetTitle(panel2_title);
   wm::ActivateWindow(window1);
   ToggleOverview();
 
   gfx::RectF bounds1 = GetTransformedBoundsInRootWindow(window1);
   gfx::Point point1(bounds1.top_right().x() - 1, bounds1.top_right().y() - 1);
-  aura::test::EventGenerator event_generator1(window1->GetRootWindow(), point1);
+  ui::test::EventGenerator event_generator1(window1->GetRootWindow(), point1);
 
   EXPECT_FALSE(widget1->IsClosed());
   event_generator1.ClickLeftButton();
   EXPECT_TRUE(widget1->IsClosed());
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsSelecting());
   WindowSelectorItem* window_item = GetWindowItemsForRoot(0).front();
   EXPECT_FALSE(window_item->empty());
   EXPECT_TRUE(window_item->Contains(window2));
   EXPECT_TRUE(GetCloseButton(window_item)->IsVisible());
 
 
   views::Label* label = GetLabelView(window_item);
   EXPECT_EQ(label->text(), panel2_title);
 
   gfx::RectF bounds2 = GetTransformedBoundsInRootWindow(window2);
   gfx::Point point2(bounds2.top_right().x() - 1, bounds2.top_right().y() - 1);
-  aura::test::EventGenerator event_generator2(window2->GetRootWindow(), point2);
+  ui::test::EventGenerator event_generator2(window2->GetRootWindow(), point2);
 
   EXPECT_FALSE(widget2->IsClosed());
   event_generator2.ClickLeftButton();
   EXPECT_TRUE(widget2->IsClosed());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsSelecting());
 }
 
 // Creates three windows and tests filtering them by title.
 TEST_F(WindowSelectorTest, BasicTextFiltering) {
@@ skipping 70 matching lines @@
    // Dimming all the items should hide the selection widget.
    FilterItems("Pop");
    EXPECT_FALSE(selection_widget_active());
 
    // Undimming one window should automatically select it.
    FilterItems("Rock and roll");
    EXPECT_EQ(GetSelectedWindow(), window2.get());
 }
 
 }  // namespace ash