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

chrome/browser/ui/window_sizer/window_sizer_ash_uitest.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/shelf/shelf.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/test/shelf_test_api.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/test/ui_controls.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/view_model.h"
 
 namespace {
 
 class WindowSizerTest : public InProcessBrowserTest {
  public:
   WindowSizerTest() {}
   virtual ~WindowSizerTest() {}
@@ skipping 18 matching lines @@
   ash::Shelf* shelf = ash::Shelf::ForWindow(root_window);
   const ash::ShelfView* shelf_view =
       ash::test::ShelfTestAPI(shelf).shelf_view();
   const views::ViewModel* view_model = shelf_view->view_model_for_test();
 
   EXPECT_EQ(2, view_model->view_size());
   return view_model->view_at(1)->GetBoundsInScreen();
 }
 
 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {
-  aura::test::EventGenerator generator(root_window);
+  ui::test::EventGenerator generator(root_window);
   gfx::Point center =
       GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
   gfx::Display display =
       ash::Shell::GetScreen()->GetDisplayNearestWindow(root_window);
   const gfx::Point& origin = display.bounds().origin();
   center.Offset(- origin.x(), - origin.y());
   generator.MoveMouseTo(center);
   generator.ClickLeftButton();
 }
 
@@ skipping 123 matching lines @@
 
   // Next new browser must be created on 1st display.
   ASSERT_EQ(2u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow());
   EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
 
   // Balanced with the chrome::IncrementKeepAliveCount above.
   chrome::DecrementKeepAliveCount();
 }