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

trunk/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

Index: trunk/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc	(revision 285220)
+++ trunk/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc	(working copy)
@@ -18,6 +18,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "grit/generated_resources.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/clipboard.h"
@@ -27,7 +28,6 @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 
 class OmniboxViewViewsTest : public InProcessBrowserTest {
@@ -73,8 +73,8 @@
   void TapBrowserWindowCenter() {
     gfx::Point center = BrowserView::GetBrowserViewForBrowser(
         browser())->GetBoundsInScreen().CenterPoint();
-    ui::test::EventGenerator generator(
-        browser()->window()->GetNativeWindow()->GetRootWindow());
+    aura::test::EventGenerator generator(browser()->window()->
+        GetNativeWindow()->GetRootWindow());
     generator.GestureTapAt(center);
   }