MacViews: Add WidgetEventGenerator to abstract platform-specific event generation for tests.

ui/aura/test/event_generator.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/aura/test/event_generator.h"
 
-#include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
-#include "base/time/default_tick_clock.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/events/event.h"
-#include "ui/events/event_source.h"
-#include "ui/events/event_utils.h"
-#include "ui/events/test/events_test_utils.h"
-#include "ui/gfx/vector2d_conversions.h"
-
-#if defined(USE_X11)
-#include <X11/Xlib.h>
-#include "ui/base/x/x11_util.h"
-#include "ui/events/event_utils.h"
-#include "ui/events/test/events_test_utils_x11.h"
-#endif
-
-#if defined(OS_WIN)
-#include "ui/events/keycodes/keyboard_code_conversion.h"
-#endif
 
 namespace aura {
 namespace test {
 namespace {
 
-void DummyCallback(ui::EventType, const gfx::Vector2dF&) {
-}
-
-class DefaultEventGeneratorDelegate : public EventGeneratorDelegate {
+class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
  public:
   explicit DefaultEventGeneratorDelegate(Window* root_window)
       : root_window_(root_window) {}
   virtual ~DefaultEventGeneratorDelegate() {}
 
   // EventGeneratorDelegate overrides:
   virtual WindowTreeHost* GetHostAt(const gfx::Point& point) const OVERRIDE {
     return root_window_->GetHost();
   }
 
   virtual client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const OVERRIDE {
     return NULL;
   }
 
  private:
   Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultEventGeneratorDelegate);
 };
 
 class TestKeyEvent : public ui::KeyEvent {

[tapted, 2014/07/14 11:42:12]

oops - this and TestTouchEvent are no longer needed here. I'll remove them.

[tapted, 2014/07/15 12:43:26]

Done.

  public:
   TestKeyEvent(const base::NativeEvent& native_event, int flags, bool is_char)
       : KeyEvent(native_event, is_char) {
     set_flags(flags);
   }
 };
 
 class TestTouchEvent : public ui::TouchEvent {
  public:
   TestTouchEvent(ui::EventType type,
                  const gfx::Point& root_location,
                  int touch_id,
                  int flags,
                  base::TimeDelta timestamp)
       : TouchEvent(type, root_location, flags, touch_id, timestamp,
                    1.0f, 1.0f, 1.0f, 1.0f) {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestTouchEvent);
 };
 
-const int kAllButtonMask = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON;
+const Window* WindowFromTarget(const ui::EventTarget* event_target) {
+  return static_cast<const Window*>(event_target);
+}
 
 }  // namespace
 
-EventGenerator::EventGenerator(Window* root_window)
-    : delegate_(new DefaultEventGeneratorDelegate(root_window)),
-      current_host_(delegate_->GetHostAt(current_location_)),
-      flags_(0),
-      grab_(false),
-      async_(false),
-      tick_clock_(new base::DefaultTickClock()) {
+EventGeneratorDelegateAura::EventGeneratorDelegateAura() {
 }
 
-EventGenerator::EventGenerator(Window* root_window, const gfx::Point& point)
-    : delegate_(new DefaultEventGeneratorDelegate(root_window)),
-      current_location_(point),
-      current_host_(delegate_->GetHostAt(current_location_)),
-      flags_(0),
-      grab_(false),
-      async_(false),
-      tick_clock_(new base::DefaultTickClock()) {
+EventGeneratorDelegateAura::~EventGeneratorDelegateAura() {
 }
 
-EventGenerator::EventGenerator(Window* root_window, Window* window)
-    : delegate_(new DefaultEventGeneratorDelegate(root_window)),
-      current_location_(CenterOfWindow(window)),
-      current_host_(delegate_->GetHostAt(current_location_)),
-      flags_(0),
-      grab_(false),
-      async_(false),
-      tick_clock_(new base::DefaultTickClock()) {
+ui::EventTarget* EventGeneratorDelegateAura::GetTargetAt(
+    const gfx::Point& location) {
+  return GetHostAt(location)->window();
 }
 
-EventGenerator::EventGenerator(EventGeneratorDelegate* delegate)
-    : delegate_(delegate),
-      current_host_(delegate_->GetHostAt(current_location_)),
-      flags_(0),
-      grab_(false),
-      async_(false),
-      tick_clock_(new base::DefaultTickClock()) {
+ui::EventSource* EventGeneratorDelegateAura::GetEventSource(
+    ui::EventTarget* target) {
+  return static_cast<Window*>(target)->GetHost()->GetEventSource();
 }
 
-EventGenerator::~EventGenerator() {
-  for (std::list<ui::Event*>::iterator i = pending_events_.begin();
-      i != pending_events_.end(); ++i)
-    delete *i;
-  pending_events_.clear();
+gfx::Point EventGeneratorDelegateAura::CenterOfTarget(
+    const ui::EventTarget* target) const {
+  gfx::Point center =
+      gfx::Rect(WindowFromTarget(target)->bounds().size()).CenterPoint();
+  ConvertPointFromTarget(target, &center);
+  return center;
 }
 
-void EventGenerator::PressLeftButton() {
-  PressButton(ui::EF_LEFT_MOUSE_BUTTON);
-}
-
-void EventGenerator::ReleaseLeftButton() {
-  ReleaseButton(ui::EF_LEFT_MOUSE_BUTTON);
-}
-
-void EventGenerator::ClickLeftButton() {
-  PressLeftButton();
-  ReleaseLeftButton();
-}
-
-void EventGenerator::DoubleClickLeftButton() {
-  flags_ |= ui::EF_IS_DOUBLE_CLICK;
-  PressLeftButton();
-  flags_ ^= ui::EF_IS_DOUBLE_CLICK;
-  ReleaseLeftButton();
-}
-
-void EventGenerator::PressRightButton() {
-  PressButton(ui::EF_RIGHT_MOUSE_BUTTON);
-}
-
-void EventGenerator::ReleaseRightButton() {
-  ReleaseButton(ui::EF_RIGHT_MOUSE_BUTTON);
-}
-
-void EventGenerator::MoveMouseWheel(int delta_x, int delta_y) {
-  gfx::Point location = GetLocationInCurrentRoot();
-  ui::MouseEvent mouseev(ui::ET_MOUSEWHEEL, location, location, flags_, 0);
-  ui::MouseWheelEvent wheelev(mouseev, delta_x, delta_y);
-  Dispatch(&wheelev);
-}
-
-void EventGenerator::SendMouseExit() {
-  gfx::Point exit_location(current_location_);
-  ConvertPointToTarget(current_host_->window(), &exit_location);
-  ui::MouseEvent mouseev(ui::ET_MOUSE_EXITED, exit_location, exit_location,
-                         flags_, 0);
-  Dispatch(&mouseev);
-}
-
-void EventGenerator::MoveMouseToInHost(const gfx::Point& point_in_host) {
-  const ui::EventType event_type = (flags_ & ui::EF_LEFT_MOUSE_BUTTON) ?
-      ui::ET_MOUSE_DRAGGED : ui::ET_MOUSE_MOVED;
-  ui::MouseEvent mouseev(event_type, point_in_host, point_in_host, flags_, 0);
-  Dispatch(&mouseev);
-
-  current_location_ = point_in_host;
-  current_host_->ConvertPointFromHost(&current_location_);
-}
-
-void EventGenerator::MoveMouseTo(const gfx::Point& point_in_screen,
-                                 int count) {
-  DCHECK_GT(count, 0);
-  const ui::EventType event_type = (flags_ & ui::EF_LEFT_MOUSE_BUTTON) ?
-      ui::ET_MOUSE_DRAGGED : ui::ET_MOUSE_MOVED;
-
-  gfx::Vector2dF diff(point_in_screen - current_location_);
-  for (float i = 1; i <= count; i++) {
-    gfx::Vector2dF step(diff);
-    step.Scale(i / count);
-    gfx::Point move_point = current_location_ + gfx::ToRoundedVector2d(step);
-    if (!grab_)
-      UpdateCurrentDispatcher(move_point);
-    ConvertPointToTarget(current_host_->window(), &move_point);
-    ui::MouseEvent mouseev(event_type, move_point, move_point, flags_, 0);
-    Dispatch(&mouseev);
-  }
-  current_location_ = point_in_screen;
-}
-
-void EventGenerator::MoveMouseRelativeTo(const Window* window,
-                                         const gfx::Point& point_in_parent) {
-  gfx::Point point(point_in_parent);
-  ConvertPointFromTarget(window, &point);
-  MoveMouseTo(point);
-}
-
-void EventGenerator::DragMouseTo(const gfx::Point& point) {
-  PressLeftButton();
-  MoveMouseTo(point);
-  ReleaseLeftButton();
-}
-
-void EventGenerator::MoveMouseToCenterOf(Window* window) {
-  MoveMouseTo(CenterOfWindow(window));
-}
-
-void EventGenerator::PressTouch() {
-  PressTouchId(0);
-}
-
-void EventGenerator::PressTouchId(int touch_id) {
-  TestTouchEvent touchev(
-      ui::ET_TOUCH_PRESSED, GetLocationInCurrentRoot(), touch_id, flags_,
-      Now());
-  Dispatch(&touchev);
-}
-
-void EventGenerator::MoveTouch(const gfx::Point& point) {
-  MoveTouchId(point, 0);
-}
-
-void EventGenerator::MoveTouchId(const gfx::Point& point, int touch_id) {
-  current_location_ = point;
-  TestTouchEvent touchev(
-      ui::ET_TOUCH_MOVED, GetLocationInCurrentRoot(), touch_id, flags_,
-      Now());
-  Dispatch(&touchev);
-
-  if (!grab_)
-    UpdateCurrentDispatcher(point);
-}
-
-void EventGenerator::ReleaseTouch() {
-  ReleaseTouchId(0);
-}
-
-void EventGenerator::ReleaseTouchId(int touch_id) {
-  TestTouchEvent touchev(
-      ui::ET_TOUCH_RELEASED, GetLocationInCurrentRoot(), touch_id, flags_,
-      Now());
-  Dispatch(&touchev);
-}
-
-void EventGenerator::PressMoveAndReleaseTouchTo(const gfx::Point& point) {
-  PressTouch();
-  MoveTouch(point);
-  ReleaseTouch();
-}
-
-void EventGenerator::PressMoveAndReleaseTouchToCenterOf(Window* window) {
-  PressMoveAndReleaseTouchTo(CenterOfWindow(window));
-}
-
-void EventGenerator::GestureEdgeSwipe() {
-  ui::GestureEvent gesture(
-      ui::ET_GESTURE_WIN8_EDGE_SWIPE,
-      0,
-      0,
-      0,
-      Now(),
-      ui::GestureEventDetails(ui::ET_GESTURE_WIN8_EDGE_SWIPE, 0, 0),
-      0);
-  Dispatch(&gesture);
-}
-
-void EventGenerator::GestureTapAt(const gfx::Point& location) {
-  const int kTouchId = 2;
-  ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
-                       location,
-                       kTouchId,
-                       Now());
-  Dispatch(&press);
-
-  ui::TouchEvent release(
-      ui::ET_TOUCH_RELEASED, location, kTouchId,
-      press.time_stamp() + base::TimeDelta::FromMilliseconds(50));
-  Dispatch(&release);
-}
-
-void EventGenerator::GestureTapDownAndUp(const gfx::Point& location) {
-  const int kTouchId = 3;
-  ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
-                       location,
-                       kTouchId,
-                       Now());
-  Dispatch(&press);
-
-  ui::TouchEvent release(
-      ui::ET_TOUCH_RELEASED, location, kTouchId,
-      press.time_stamp() + base::TimeDelta::FromMilliseconds(1000));
-  Dispatch(&release);
-}
-
-void EventGenerator::GestureScrollSequence(const gfx::Point& start,
-                                           const gfx::Point& end,
-                                           const base::TimeDelta& step_delay,
-                                           int steps) {
-  GestureScrollSequenceWithCallback(start, end, step_delay, steps,
-                                    base::Bind(&DummyCallback));
-}
-
-void EventGenerator::GestureScrollSequenceWithCallback(
-    const gfx::Point& start,
-    const gfx::Point& end,
-    const base::TimeDelta& step_delay,
-    int steps,
-    const ScrollStepCallback& callback) {
-  const int kTouchId = 5;
-  base::TimeDelta timestamp = Now();
-  ui::TouchEvent press(ui::ET_TOUCH_PRESSED, start, kTouchId, timestamp);
-  Dispatch(&press);
-
-  callback.Run(ui::ET_GESTURE_SCROLL_BEGIN, gfx::Vector2dF());
-
-  int dx = (end.x() - start.x()) / steps;
-  int dy = (end.y() - start.y()) / steps;
-  gfx::Point location = start;
-  for (int i = 0; i < steps; ++i) {
-    location.Offset(dx, dy);
-    timestamp += step_delay;
-    ui::TouchEvent move(ui::ET_TOUCH_MOVED, location, kTouchId, timestamp);
-    Dispatch(&move);
-    callback.Run(ui::ET_GESTURE_SCROLL_UPDATE, gfx::Vector2dF(dx, dy));
-  }
-
-  ui::TouchEvent release(ui::ET_TOUCH_RELEASED, end, kTouchId, timestamp);
-  Dispatch(&release);
-
-  callback.Run(ui::ET_GESTURE_SCROLL_END, gfx::Vector2dF());
-}
-
-void EventGenerator::GestureMultiFingerScroll(int count,
-                                              const gfx::Point start[],
-                                              int event_separation_time_ms,
-                                              int steps,
-                                              int move_x,
-                                              int move_y) {
-  const int kMaxTouchPoints = 10;
-  int delays[kMaxTouchPoints] = { 0 };
-  GestureMultiFingerScrollWithDelays(
-      count, start, delays, event_separation_time_ms, steps, move_x, move_y);
-}
-
-void EventGenerator::GestureMultiFingerScrollWithDelays(
-    int count,
-    const gfx::Point start[],
-    const int delay_adding_finger_ms[],
-    int event_separation_time_ms,
-    int steps,
-    int move_x,
-    int move_y) {
-  const int kMaxTouchPoints = 10;
-  gfx::Point points[kMaxTouchPoints];
-  CHECK_LE(count, kMaxTouchPoints);
-  CHECK_GT(steps, 0);
-
-  int delta_x = move_x / steps;
-  int delta_y = move_y / steps;
-
-  for (int i = 0; i < count; ++i) {
-    points[i] = start[i];
-  }
-
-  base::TimeDelta press_time_first = Now();
-  base::TimeDelta press_time[kMaxTouchPoints];
-  bool pressed[kMaxTouchPoints];
-  for (int i = 0; i < count; ++i) {
-    pressed[i] = false;
-    press_time[i] = press_time_first +
-        base::TimeDelta::FromMilliseconds(delay_adding_finger_ms[i]);
-  }
-
-  int last_id = 0;
-  for (int step = 0; step < steps; ++step) {
-    base::TimeDelta move_time = press_time_first +
-        base::TimeDelta::FromMilliseconds(event_separation_time_ms * step);
-
-    while (last_id < count &&
-           !pressed[last_id] &&
-           move_time >= press_time[last_id]) {
-      ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
-                           points[last_id],
-                           last_id,
-                           press_time[last_id]);
-      Dispatch(&press);
-      pressed[last_id] = true;
-      last_id++;
-    }
-
-    for (int i = 0; i < count; ++i) {
-      points[i].Offset(delta_x, delta_y);
-      if (i >= last_id)
-        continue;
-      ui::TouchEvent move(ui::ET_TOUCH_MOVED, points[i], i, move_time);
-      Dispatch(&move);
-    }
-  }
-
-  base::TimeDelta release_time = press_time_first +
-      base::TimeDelta::FromMilliseconds(event_separation_time_ms * steps);
-  for (int i = 0; i < last_id; ++i) {
-    ui::TouchEvent release(
-        ui::ET_TOUCH_RELEASED, points[i], i, release_time);
-    Dispatch(&release);
-  }
-}
-
-void EventGenerator::ScrollSequence(const gfx::Point& start,
-                                    const base::TimeDelta& step_delay,
-                                    float x_offset,
-                                    float y_offset,
-                                    int steps,
-                                    int num_fingers) {
-  base::TimeDelta timestamp = Now();
-  ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
-                               start,
-                               timestamp,
-                               0,
-                               0, 0,
-                               0, 0,
-                               num_fingers);
-  Dispatch(&fling_cancel);
-
-  float dx = x_offset / steps;
-  float dy = y_offset / steps;
-  for (int i = 0; i < steps; ++i) {
-    timestamp += step_delay;
-    ui::ScrollEvent move(ui::ET_SCROLL,
-                         start,
-                         timestamp,
-                         0,
-                         dx, dy,
-                         dx, dy,
-                         num_fingers);
-    Dispatch(&move);
-  }
-
-  ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START,
-                              start,
-                              timestamp,
-                              0,
-                              x_offset, y_offset,
-                              x_offset, y_offset,
-                              num_fingers);
-  Dispatch(&fling_start);
-}
-
-void EventGenerator::ScrollSequence(const gfx::Point& start,
-                                    const base::TimeDelta& step_delay,
-                                    const std::vector<gfx::Point>& offsets,
-                                    int num_fingers) {
-  int steps = offsets.size();
-  base::TimeDelta timestamp = Now();
-  ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
-                               start,
-                               timestamp,
-                               0,
-                               0, 0,
-                               0, 0,
-                               num_fingers);
-  Dispatch(&fling_cancel);
-
-  for (int i = 0; i < steps; ++i) {
-    timestamp += step_delay;
-    ui::ScrollEvent scroll(ui::ET_SCROLL,
-                           start,
-                           timestamp,
-                           0,
-                           offsets[i].x(), offsets[i].y(),
-                           offsets[i].x(), offsets[i].y(),
-                           num_fingers);
-    Dispatch(&scroll);
-  }
-
-  ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START,
-                              start,
-                              timestamp,
-                              0,
-                              offsets[steps - 1].x(), offsets[steps - 1].y(),
-                              offsets[steps - 1].x(), offsets[steps - 1].y(),
-                              num_fingers);
-  Dispatch(&fling_start);
-}
-
-void EventGenerator::PressKey(ui::KeyboardCode key_code, int flags) {
-  DispatchKeyEvent(true, key_code, flags);
-}
-
-void EventGenerator::ReleaseKey(ui::KeyboardCode key_code, int flags) {
-  DispatchKeyEvent(false, key_code, flags);
-}
-
-void EventGenerator::Dispatch(ui::Event* event) {
-  DoDispatchEvent(event, async_);
-}
-
-void EventGenerator::SetTickClock(scoped_ptr<base::TickClock> tick_clock) {
-  tick_clock_ = tick_clock.Pass();
-}
-
-base::TimeDelta EventGenerator::Now() {
-  // This is the same as what EventTimeForNow() does, but here we do it
-  // with a tick clock that can be replaced with a simulated clock for tests.
-  return base::TimeDelta::FromInternalValue(
-      tick_clock_->NowTicks().ToInternalValue());
-}
-
-void EventGenerator::DispatchKeyEvent(bool is_press,
-                                      ui::KeyboardCode key_code,
-                                      int flags) {
-#if defined(OS_WIN)
-  UINT key_press = WM_KEYDOWN;
-  uint16 character = ui::GetCharacterFromKeyCode(key_code, flags);
-  if (is_press && character) {
-    MSG native_event = { NULL, WM_KEYDOWN, key_code, 0 };
-    TestKeyEvent keyev(native_event, flags, false);
-    Dispatch(&keyev);
-    // On Windows, WM_KEYDOWN event is followed by WM_CHAR with a character
-    // if the key event cooresponds to a real character.
-    key_press = WM_CHAR;
-    key_code = static_cast<ui::KeyboardCode>(character);
-  }
-  MSG native_event =
-      { NULL, (is_press ? key_press : WM_KEYUP), key_code, 0 };
-  TestKeyEvent keyev(native_event, flags, key_press == WM_CHAR);
-#elif defined(USE_X11)
-  ui::ScopedXI2Event xevent;
-  xevent.InitKeyEvent(is_press ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED,
-                      key_code,
-                      flags);
-  ui::KeyEvent keyev(xevent, false);
-#else
-  ui::EventType type = is_press ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED;
-  ui::KeyEvent keyev(type, key_code, flags, false);
-#endif  // OS_WIN
-  Dispatch(&keyev);
-}
-
-void EventGenerator::UpdateCurrentDispatcher(const gfx::Point& point) {
-  current_host_ = delegate_->GetHostAt(point);
-}
-
-void EventGenerator::PressButton(int flag) {
-  if (!(flags_ & flag)) {
-    flags_ |= flag;
-    grab_ = flags_ & kAllButtonMask;
-    gfx::Point location = GetLocationInCurrentRoot();
-    ui::MouseEvent mouseev(ui::ET_MOUSE_PRESSED, location, location, flags_,
-                           flag);
-    Dispatch(&mouseev);
-  }
-}
-
-void EventGenerator::ReleaseButton(int flag) {
-  if (flags_ & flag) {
-    gfx::Point location = GetLocationInCurrentRoot();
-    ui::MouseEvent mouseev(ui::ET_MOUSE_RELEASED, location,
-                           location, flags_, flag);
-    Dispatch(&mouseev);
-    flags_ ^= flag;
-  }
-  grab_ = flags_ & kAllButtonMask;
-}
-
-void EventGenerator::ConvertPointFromTarget(const aura::Window* target,
-                                            gfx::Point* point) const {
+void EventGeneratorDelegateAura::ConvertPointFromTarget(
+    const ui::EventTarget* event_target,
+    gfx::Point* point) const {
   DCHECK(point);
-  aura::client::ScreenPositionClient* client =
-      delegate_->GetScreenPositionClient(target);
+  const Window* target = WindowFromTarget(event_target);
+  aura::client::ScreenPositionClient* client = GetScreenPositionClient(target);
   if (client)
     client->ConvertPointToScreen(target, point);
   else
     aura::Window::ConvertPointToTarget(target, target->GetRootWindow(), point);
 }
 
-void EventGenerator::ConvertPointToTarget(const aura::Window* target,
-                                          gfx::Point* point) const {
+void EventGeneratorDelegateAura::ConvertPointToTarget(
+    const ui::EventTarget* event_target,
+    gfx::Point* point) const {
   DCHECK(point);
-  aura::client::ScreenPositionClient* client =
-      delegate_->GetScreenPositionClient(target);
+  const Window* target = WindowFromTarget(event_target);
+  aura::client::ScreenPositionClient* client = GetScreenPositionClient(target);
   if (client)
     client->ConvertPointFromScreen(target, point);
   else
     aura::Window::ConvertPointToTarget(target->GetRootWindow(), target, point);
 }
 
-gfx::Point EventGenerator::GetLocationInCurrentRoot() const {
-  gfx::Point p(current_location_);
-  ConvertPointToTarget(current_host_->window(), &p);
-  return p;
+void EventGeneratorDelegateAura::ConvertPointFromHost(
+    const ui::EventTarget* hosted_target,
+    gfx::Point* point) const {
+  const Window* window = WindowFromTarget(hosted_target);
+  window->GetHost()->ConvertPointFromHost(point);
 }
 
-gfx::Point EventGenerator::CenterOfWindow(const Window* window) const {
-  gfx::Point center = gfx::Rect(window->bounds().size()).CenterPoint();
-  ConvertPointFromTarget(window, &center);
-  return center;
+EventGenerator::EventGenerator(Window* root_window)
+    : ui::test::EventGenerator(new DefaultEventGeneratorDelegate(root_window),
+                               gfx::Point()) {
 }
 
-void EventGenerator::DoDispatchEvent(ui::Event* event, bool async) {
-  if (async) {
-    ui::Event* pending_event;
-    if (event->IsKeyEvent()) {
-      pending_event = new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event));
-    } else if (event->IsMouseEvent()) {
-      pending_event = new ui::MouseEvent(*static_cast<ui::MouseEvent*>(event));
-    } else if (event->IsTouchEvent()) {
-      pending_event = new ui::TouchEvent(*static_cast<ui::TouchEvent*>(event));
-    } else if (event->IsScrollEvent()) {
-      pending_event =
-          new ui::ScrollEvent(*static_cast<ui::ScrollEvent*>(event));
-    } else {
-      NOTREACHED() << "Invalid event type";
-      return;
-    }
-    if (pending_events_.empty()) {
-      base::MessageLoopProxy::current()->PostTask(
-          FROM_HERE,
-          base::Bind(&EventGenerator::DispatchNextPendingEvent,
-                     base::Unretained(this)));
-    }
-    pending_events_.push_back(pending_event);
-  } else {
-    ui::EventSource* event_source = current_host_->GetEventSource();
-    ui::EventSourceTestApi event_source_test(event_source);
-    ui::EventDispatchDetails details =
-        event_source_test.SendEventToProcessor(event);
-    CHECK(!details.dispatcher_destroyed);
-  }
+EventGenerator::EventGenerator(Window* root_window, const gfx::Point& point)
+    : ui::test::EventGenerator(new DefaultEventGeneratorDelegate(root_window),
+                               point) {
 }
 
-void EventGenerator::DispatchNextPendingEvent() {
-  DCHECK(!pending_events_.empty());
-  ui::Event* event = pending_events_.front();
-  DoDispatchEvent(event, false);
-  pending_events_.pop_front();
-  delete event;
-  if (!pending_events_.empty()) {
-    base::MessageLoopProxy::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&EventGenerator::DispatchNextPendingEvent,
-                   base::Unretained(this)));
-  }
+EventGenerator::EventGenerator(Window* root_window, Window* window)
+    : ui::test::EventGenerator(new DefaultEventGeneratorDelegate(root_window),
+                               gfx::Point()) {
+  set_current_location(delegate()->CenterOfTarget(window));
+  set_current_target(delegate()->GetTargetAt(current_location()));
+}
+
+EventGenerator::EventGenerator(EventGeneratorDelegateAura* delegate)
+    : ui::test::EventGenerator(delegate, gfx::Point()) {
+}
+
+EventGenerator::~EventGenerator() {
 }
 
 }  // namespace test
 }  // namespace aura