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

trunk/src/ui/aura/gestures/gesture_recognizer_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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.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_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/hit_test.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/events/gestures/gesture_recognizer_impl.h"
 #include "ui/events/gestures/gesture_sequence.h"
 #include "ui/events/gestures/gesture_types.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 #include <queue>
 
 namespace aura {
 namespace test {
 
 namespace {
@@ skipping 2428 matching lines @@
   delegate->Reset();
   delegate->ReceivedAckPreventDefaulted();
   EXPECT_TRUE(delegate->scroll_end());
   EXPECT_TRUE(delegate->end());
 }
 
 TEST_P(GestureRecognizerTest, GestureEndLocation) {
   GestureEventConsumeDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, -1234, gfx::Rect(10, 10, 300, 300), root_window()));
-  ui::test::EventGenerator generator(root_window(), window.get());
+  EventGenerator generator(root_window(), window.get());
   const gfx::Point begin(20, 20);
   const gfx::Point end(150, 150);
   const gfx::Vector2d window_offset =
       window->bounds().origin().OffsetFromOrigin();
   generator.GestureScrollSequence(begin, end,
                                   base::TimeDelta::FromMilliseconds(20),
                                   10);
   EXPECT_EQ((begin - window_offset).ToString(),
             delegate.scroll_begin_position().ToString());
   EXPECT_EQ((end - window_offset).ToString(),
             delegate.gesture_end_location().ToString());
 }
 
 TEST_P(GestureRecognizerTest, CaptureSendsGestureEnd) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   TestGestureRecognizer* gesture_recognizer =
       new TestGestureRecognizer();
   ScopedGestureRecognizerSetter gr_setter(gesture_recognizer);
 
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       delegate.get(), -1234, gfx::Rect(10, 10, 300, 300), root_window()));
-  ui::test::EventGenerator generator(root_window());
+  EventGenerator generator(root_window());
 
   generator.MoveMouseRelativeTo(window.get(), gfx::Point(10, 10));
   generator.PressTouch();
   RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(delegate->tap_down());
 
   scoped_ptr<aura::Window> capture(CreateTestWindowWithBounds(
       gfx::Rect(10, 10, 200, 200), root_window()));
   capture->SetCapture();
@@ skipping 10 matching lines @@
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   scoped_ptr<TestEventHandler> handler(new TestEventHandler);
   root_window()->AddPreTargetHandler(handler.get());
 
   // Create a window and set it as the capture window.
   scoped_ptr<aura::Window> window1(CreateTestWindowWithDelegate(delegate.get(),
       -1234, gfx::Rect(10, 10, 300, 300), root_window()));
   window1->SetCapture();
 
-  ui::test::EventGenerator generator(root_window());
+  EventGenerator generator(root_window());
   TimedEvents tes;
 
   // Generate two touch-press events on the window.
   scoped_ptr<ui::TouchEvent> touch0(new ui::TouchEvent(ui::ET_TOUCH_PRESSED,
                                                        gfx::Point(20, 20), 0,
                                                        tes.Now()));
   scoped_ptr<ui::TouchEvent> touch1(new ui::TouchEvent(ui::ET_TOUCH_PRESSED,
                                                        gfx::Point(30, 30), 1,
                                                        tes.Now()));
   generator.Dispatch(touch0.get());
@@ skipping 318 matching lines @@
 
   const int kSteps = 15;
   const int kTouchPoints = 4;
   gfx::Point points[kTouchPoints] = {
     gfx::Point(10, 30),
     gfx::Point(30, 20),
     gfx::Point(50, 30),
     gfx::Point(80, 50)
   };
 
-  ui::test::EventGenerator generator(root_window(), window.get());
+  aura::test::EventGenerator generator(root_window(), window.get());
 
   // The unified gesture recognizer assumes a finger has stopped if it hasn't
   // moved for too long. See ui/events/gesture_detection/velocity_tracker.cc's
   // kAssumePointerStoppedTimeMs.
   for (int count = 2; count <= kTouchPoints; ++count) {
     generator.GestureMultiFingerScroll(
         count, points, 10, kSteps, 0, -11 * kSteps);
     EXPECT_TRUE(delegate->swipe_up());
     delegate->Reset();
 
@@ skipping 1546 matching lines @@
   delegate.WaitUntilReceivedGesture(ui::ET_GESTURE_LONG_PRESS);
   EXPECT_EQ(NULL, window);
 }
 
 INSTANTIATE_TEST_CASE_P(GestureRecognizer,
                         GestureRecognizerTest,
                         ::testing::Bool());
 
 }  // namespace test
 }  // namespace aura