Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."

> Cleanups for aura/test/event_generator.h (resolve TODOs)
> 
> Some purely mechanical changes left over from r283694, now that
> aura::test::EventGenerator has moved to ui::test in src/ui/events.
> 
> Moves aura/test/event_generator.* to event_generator_delegate_aura.*
> Removes `using ui::test::EventGenerator;` declaration and redirects
> includes that don't extend the delegate to include the ui/test
> event_generator.h directly
> 
> BUG=378134
> 
> Review URL: https://codereview.chromium.org/406413004

TBR=tapted@chromium.org

Review URL: https://codereview.chromium.org/413983006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285222 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 22 insertions, 22 deletions

diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc
index 9a536ae..ffece4a 100644
--- a/ui/views/corewm/capture_controller_unittest.cc
+++ b/ui/views/corewm/capture_controller_unittest.cc
@@ -7,13 +7,13 @@
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
@@ -137,7 +137,7 @@ TEST_F(CaptureControllerTest, ResetOtherWindowCaptureOnCapture) {
 TEST_F(CaptureControllerTest, TouchTargetResetOnCaptureChange) {
   // Create a window inside the WindowEventDispatcher.
   scoped_ptr<aura::Window> w1(CreateNormalWindow(1, root_window(), NULL));
-  ui::test::EventGenerator event_generator1(root_window());
+  aura::test::EventGenerator event_generator1(root_window());
   event_generator1.PressTouch();
   w1->SetCapture();
   // Both capture clients should return the same capture window.
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index a7628a6..27736f9 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -7,13 +7,13 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "ui/aura/env.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/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/events/event.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
@@ -87,7 +87,7 @@ views::Widget* CreateWidget() {
 TEST_F(DesktopCaptureControllerTest, ResetMouseHandlers) {
   scoped_ptr<Widget> w1(CreateWidget());
   scoped_ptr<Widget> w2(CreateWidget());
-  ui::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
+  aura::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
   generator1.MoveMouseToCenterOf(w1->GetNativeView());
   generator1.PressLeftButton();
   EXPECT_FALSE(w1->HasCapture());
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index 9fbb63c..8cce09c 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -9,12 +9,12 @@
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
@@ -101,7 +101,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
     helper_.reset(new TooltipControllerTestHelper(
                       GetController(widget_.get())));
-    generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
+    generator_.reset(new aura::test::EventGenerator(GetRootWindow()));
   }
 
   virtual void TearDown() OVERRIDE {
@@ -137,7 +137,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
   scoped_ptr<views::Widget> widget_;
   TooltipTestView* view_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<ui::test::EventGenerator> generator_;
+  scoped_ptr<aura::test::EventGenerator> generator_;
 
  private:
   scoped_ptr<TooltipController> controller_;
@@ -600,7 +600,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
-    generator_.reset(new ui::test::EventGenerator(root_window()));
+    generator_.reset(new aura::test::EventGenerator(root_window()));
   }
 
   virtual void TearDown() OVERRIDE {
@@ -617,7 +617,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
   // Owned by |controller_|.
   TestTooltip* test_tooltip_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<ui::test::EventGenerator> generator_;
+  scoped_ptr<aura::test::EventGenerator> generator_;
 
  private:
   scoped_ptr<TooltipController> controller_;
@@ -677,7 +677,7 @@ class TooltipControllerTest3 : public aura::test::AuraTestBase {
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
 
-    generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
+    generator_.reset(new aura::test::EventGenerator(GetRootWindow()));
     controller_.reset(new TooltipController(
         scoped_ptr<views::corewm::Tooltip>(test_tooltip_)));
     GetRootWindow()->RemovePreTargetHandler(
@@ -706,7 +706,7 @@ class TooltipControllerTest3 : public aura::test::AuraTestBase {
   // Owned by |controller_|.
   TestTooltip* test_tooltip_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<ui::test::EventGenerator> generator_;
+  scoped_ptr<aura::test::EventGenerator> generator_;
   scoped_ptr<views::Widget> widget_;
   TooltipTestView* view_;
 
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 73cf4f0..0af64c3 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -6,11 +6,11 @@
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/screen_position_client.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
@@ -543,7 +543,7 @@ TEST_F(TouchSelectionControllerImplTest,
        DoubleTapInTextfieldWithCursorHandleShouldSelectText) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
-  ui::test::EventGenerator generator(
+  aura::test::EventGenerator generator(
       textfield_->GetWidget()->GetNativeView()->GetRootWindow());
 
   // Tap the textfield to invoke touch selection.
@@ -804,7 +804,7 @@ TEST_F(TouchSelectionControllerImplTest, MouseEventDeactivatesTouchSelection) {
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
-  ui::test::EventGenerator generator(
+  aura::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
 
   generator.set_current_location(gfx::Point(5, 5));
@@ -845,7 +845,7 @@ TEST_F(TouchSelectionControllerImplTest, KeyEventDeactivatesTouchSelection) {
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
-  ui::test::EventGenerator generator(
+  aura::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
 
   RunPendingMessages();
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
index 72bc3fb..f52fe91 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc
@@ -8,10 +8,10 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index 75a71ac..0451d78 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -7,11 +7,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/test/views_test_base.h"
@@ -290,7 +290,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickHeaderMaximizes) {
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget());
 
-  ui::test::EventGenerator generator(window);
+  aura::test::EventGenerator generator(window);
   generator.ClickLeftButton();
   generator.DoubleClickLeftButton();
   RunPendingMessages();
@@ -316,7 +316,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) {
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget());
 
-  ui::test::EventGenerator generator(window);
+  aura::test::EventGenerator generator(window);
   native_widget->set_window_component(HTCLIENT);
   generator.ClickLeftButton();
   native_widget->set_window_component(HTCAPTION);
@@ -343,7 +343,7 @@ TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) {
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget()));
 
-  ui::test::EventGenerator generator(window);
+  aura::test::EventGenerator generator(window);
   native_widget->set_window_component(HTCLIENT);
   generator.ClickLeftButton();
   native_widget->set_window_component(HTCAPTION);
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index b173354..9f29b06 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -11,13 +11,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ -769,7 +769,7 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
 
   RunPendingMessages();
 
-  ui::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow());
+  aura::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow());
   generator.GestureTapAt(gfx::Point(10, 10));
   ShowQuickMenuImmediately(static_cast<TouchSelectionControllerImpl*>(
       textfield_test_api.touch_selection_controller()));