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

trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.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 "chrome/browser/ui/views/ash/tab_scrubber.h"
 
 #include "ash/display/event_transformation_handler.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 namespace {
 
 class TabScrubberTest : public InProcessBrowserTest,
                         public TabStripModelObserver {
  public:
@@ skipping 35 matching lines @@
 
   int GetTabCenter(Browser* browser, int index) {
     return GetTabStrip(browser)->tab_at(index)->bounds().CenterPoint().x();
   }
 
   // Sends one scroll event synchronously without initial or final
   // fling events.
   void SendScrubEvent(Browser* browser, int index) {
     aura::Window* window = browser->window()->GetNativeWindow();
     aura::Window* root = window->GetRootWindow();
-    ui::test::EventGenerator event_generator(root, window);
+    aura::test::EventGenerator event_generator(root, window);
     int active_index = browser->tab_strip_model()->active_index();
     TabScrubber::Direction direction = index < active_index ?
         TabScrubber::LEFT : TabScrubber::RIGHT;
     int offset = GetTabCenter(browser, index) -
         GetStartX(browser, active_index, direction);
     ui::ScrollEvent scroll_event(ui::ET_SCROLL,
                                  gfx::Point(0, 0),
                                  ui::EventTimeForNow(),
                                  0,
                                  offset, 0,
                                  offset, 0,
                                  3);
     event_generator.Dispatch(&scroll_event);
   }
 
   enum ScrubType {
     EACH_TAB,
     SKIP_TABS,
     REPEAT_TABS,
   };
 
   // Sends asynchronous events and waits for tab at |index| to become
   // active.
   void Scrub(Browser* browser, int index, ScrubType scrub_type) {
     aura::Window* window = browser->window()->GetNativeWindow();
     aura::Window* root = window->GetRootWindow();
-    ui::test::EventGenerator event_generator(root, window);
+    aura::test::EventGenerator event_generator(root, window);
     event_generator.set_async(true);
     activation_order_.clear();
     int active_index = browser->tab_strip_model()->active_index();
     ASSERT_NE(index, active_index);
     ASSERT_TRUE(scrub_type != SKIP_TABS || ((index - active_index) % 2) == 0);
     TabScrubber::Direction direction;
     int increment;
     if (index < active_index) {
       direction = TabScrubber::LEFT;
       increment = -1;
@@ skipping 22 matching lines @@
     RunUntilTabActive(browser, index);
   }
 
   // Sends events and waits for tab at |index| to become active
   // if it's different from the currently active tab.
   // If the active tab is expected to stay the same, send events
   // synchronously (as we don't have anything to wait for).
   void SendScrubSequence(Browser* browser, int x_offset, int index) {
     aura::Window* window = browser->window()->GetNativeWindow();
     aura::Window* root = window->GetRootWindow();
-    ui::test::EventGenerator event_generator(root, window);
+    aura::test::EventGenerator event_generator(root, window);
     bool wait_for_active = false;
     if (index != browser->tab_strip_model()->active_index()) {
       wait_for_active = true;
       event_generator.set_async(true);
     }
     event_generator.ScrollSequence(gfx::Point(0, 0),
                                    ui::EventTimeForNow(),
                                    x_offset,
                                    0,
                                    1,
@@ skipping 250 matching lines @@
 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {
   AddTabs(browser(), 1);
 
   SendScrubEvent(browser(), 0);
   EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());
   browser()->window()->Close();
   EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());
 }
 
 #endif  // defined(OS_CHROMEOS)