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

ash/autoclick/autoclick_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 "ash/autoclick/autoclick_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_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/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
 class MouseEventCapturer : public ui::EventHandler {
  public:
   MouseEventCapturer() { Reset(); }
   virtual ~MouseEventCapturer() {}
 
   void Reset() {
     events_.clear();
@@ skipping 194 matching lines @@
 TEST_F(AutoclickTest, ExtendedDisplay) {
   UpdateDisplay("1280x1024,800x600");
   RunAllPendingInMessageLoop();
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2u, root_windows.size());
 
   GetAutoclickController()->SetEnabled(true);
   std::vector<ui::MouseEvent> events;
 
   // Test first root window.
-  aura::test::EventGenerator generator1(root_windows[0]);
+  ui::test::EventGenerator generator1(root_windows[0]);
   generator1.MoveMouseTo(100, 200);
   events = WaitForMouseEvents();
   EXPECT_EQ(2u, events.size());
   EXPECT_EQ(100, events[0].root_location().x());
   EXPECT_EQ(200, events[0].root_location().y());
 
   // Test second root window.
-  aura::test::EventGenerator generator2(root_windows[1]);
+  ui::test::EventGenerator generator2(root_windows[1]);
   generator2.MoveMouseTo(300, 400);
   events = WaitForMouseEvents();
   EXPECT_EQ(2u, events.size());
   EXPECT_EQ(300, events[0].root_location().x());
   EXPECT_EQ(400, events[0].root_location().y());
 
   // Test movement threshold between displays.
 }
 
 TEST_F(AutoclickTest, UserInputCancelsAutoclick) {
@@ skipping 52 matching lines @@
   aura::test::EventCountDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
       &delegate, 123, gfx::Rect(50, 50, 100, 100)));
   window->Show();
   events = WaitForMouseEvents();
   EXPECT_EQ(0u, events.size());
   EXPECT_EQ("1 1 0", delegate.GetMouseMotionCountsAndReset());
 }
 
 }  // namespace ash