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

trunk/src/content/browser/web_contents/aura/window_slider_unittest.cc

 // Copyright (c) 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 "content/browser/web_contents/aura/window_slider.h"
 
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.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.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/frame_time.h"
 
 namespace content {
 
 void DispatchEventDuringScrollCallback(ui::EventProcessor* dispatcher,
                                        ui::Event* event,
                                        ui::EventType type,
                                        const gfx::Vector2dF& delta) {
   if (type != ui::ET_GESTURE_SCROLL_UPDATE)
     return;
@@ skipping 177 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WindowSliderDeleteOwnerOnComplete);
 };
 
 typedef aura::test::AuraTestBase WindowSliderTest;
 
 TEST_F(WindowSliderTest, WindowSlideUsingGesture) {
   scoped_ptr<aura::Window> window(CreateNormalWindow(0, root_window(), NULL));
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   WindowSlider* slider =
       new WindowSlider(&slider_delegate, root_window(), window.get());
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(10, 10),
       gfx::Point(180, 10),
       base::TimeDelta::FromMilliseconds(10),
       10,
       base::Bind(&ConfirmSlideDuringScrollCallback, slider));
@@ skipping 75 matching lines @@
     new ui::KeyEvent(ui::ET_KEY_PRESSED,
                      ui::VKEY_A,
                      0,
                      true),
     NULL
   };
 
   new WindowSlider(&slider_delegate, root_window(), window.get());
   for (int i = 0; events[i]; ++i) {
     // Generate a horizontal overscroll.
-    ui::test::EventGenerator generator(root_window());
+    aura::test::EventGenerator generator(root_window());
     generator.GestureScrollSequenceWithCallback(
         gfx::Point(10, 10),
         gfx::Point(80, 10),
         base::TimeDelta::FromMilliseconds(10),
         1,
         base::Bind(&DispatchEventDuringScrollCallback,
                    root_window()->GetHost()->event_processor(),
                    base::Owned(events[i])));
     EXPECT_TRUE(slider_delegate.created_back_layer());
     EXPECT_TRUE(slider_delegate.slide_aborted());
@@ skipping 21 matching lines @@
   ui::LayerAnimatorTestController test_controller(animator);
 
   WindowSlider* slider =
       new WindowSlider(&slider_delegate, root_window(), window.get());
 
   ui::MouseEvent interrupt_event(ui::ET_MOUSE_MOVED,
                                  gfx::Point(55, 10),
                                  gfx::Point(55, 10),
                                  0, 0);
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Start the scroll sequence. Scroll forward so that |window|'s layer is the
   // one animating.
   const int kTouchId = 5;
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
                        gfx::Point(10, 10),
                        kTouchId,
                        ui::EventTimeForNow());
   generator.Dispatch(&press);
 
@@ skipping 79 matching lines @@
   window_delegate.set_window_component(HTNOWHERE);
   scoped_ptr<aura::Window> window(CreateNormalWindow(1, parent.get(),
                                                      &window_delegate));
 
   WindowSliderDelegateTest slider_delegate;
   scoped_ptr<WindowSlider> slider(
       new WindowSlider(&slider_delegate, parent.get(), window.get()));
 
   // Generate a horizontal scroll, and change the owner in the middle of the
   // scroll.
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
   aura::Window* old_window = window.get();
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(10, 10),
       gfx::Point(80, 10),
       base::TimeDelta::FromMilliseconds(10),
       1,
       base::Bind(&ChangeSliderOwnerDuringScrollCallback,
                  base::Unretained(&window),
                  slider.get()));
   aura::Window* new_window = window.get();
@@ skipping 11 matching lines @@
 // shouldn't start the slide or change delegate's state in any way in response
 // to user input.
 TEST_F(WindowSliderTest, NoSlideWhenLayerCantBeCreated) {
   scoped_ptr<aura::Window> window(CreateNormalWindow(0, root_window(), NULL));
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
   slider_delegate.SetCanCreateLayer(false);
   WindowSlider* slider =
       new WindowSlider(&slider_delegate, root_window(), window.get());
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // No slide in progress should be reported during scroll since the layer
   // wasn't created.
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(10, 10),
       gfx::Point(180, 10),
       base::TimeDelta::FromMilliseconds(10),
       1,
       base::Bind(&ConfirmNoSlideDuringScrollCallback, slider));
 
@@ skipping 25 matching lines @@
 
 // Tests that the owner window can be destroyed from |OnWindowSliderDestroyed()|
 // delegate callback without causing a crash.
 TEST_F(WindowSliderTest, OwnerIsDestroyedOnSliderDestroy) {
   size_t child_windows = root_window()->children().size();
   aura::Window* window = CreateNormalWindow(0, root_window(), NULL);
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   EXPECT_EQ(child_windows + 1, root_window()->children().size());
 
   WindowSliderDeleteOwnerOnDestroy slider_delegate(window);
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   scoped_ptr<WindowSlider> slider(
       new WindowSlider(&slider_delegate, root_window(), window));
   generator.GestureScrollSequence(gfx::Point(10, 10),
                                   gfx::Point(180, 10),
                                   base::TimeDelta::FromMilliseconds(10),
                                   10);
   EXPECT_TRUE(slider_delegate.created_back_layer());
   EXPECT_TRUE(slider_delegate.slide_completing());
@@ skipping 10 matching lines @@
 
 // Tests that the owner window can be destroyed from |OnWindowSlideComplete()|
 // delegate callback without causing a crash.
 TEST_F(WindowSliderTest, OwnerIsDestroyedOnSlideComplete) {
   size_t child_windows = root_window()->children().size();
   aura::Window* window = CreateNormalWindow(0, root_window(), NULL);
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   EXPECT_EQ(child_windows + 1, root_window()->children().size());
 
   WindowSliderDeleteOwnerOnComplete slider_delegate(window);
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   new WindowSlider(&slider_delegate, root_window(), window);
   generator.GestureScrollSequence(gfx::Point(10, 10),
                                   gfx::Point(180, 10),
                                   base::TimeDelta::FromMilliseconds(10),
                                   10);
   EXPECT_TRUE(slider_delegate.created_back_layer());
   EXPECT_TRUE(slider_delegate.slide_completing());
   EXPECT_TRUE(slider_delegate.slide_completed());
@@ skipping 16 matching lines @@
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
   new WindowSlider(&slider_delegate, root_window(), window.get());
 
   ui::ScopedAnimationDurationScaleMode normal_duration_(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
   ui::LayerAnimator* animator = window->layer()->GetAnimator();
   animator->set_disable_timer_for_test(true);
   ui::LayerAnimatorTestController test_controller(animator);
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Swipe forward so that |window|'s layer is the one animating.
   generator.GestureScrollSequence(
       gfx::Point(10, 10),
       gfx::Point(180, 10),
       base::TimeDelta::FromMilliseconds(10),
       2);
   EXPECT_TRUE(slider_delegate.created_back_layer());
   EXPECT_FALSE(slider_delegate.slide_aborted());
   EXPECT_FALSE(slider_delegate.created_front_layer());
@@ skipping 29 matching lines @@
   animator->Step(start_time2 + duration);
   // The animation for the second slide should now be completed.
   EXPECT_TRUE(slider_delegate.slide_completed());
   slider_delegate.Reset();
 
   window.reset();
   EXPECT_TRUE(slider_delegate.slider_destroyed());
 }
 
 }  // namespace content