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

ash/first_run/first_run_helper_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/first_run/first_run_helper.h"
 
 #include "ash/first_run/desktop_cleaner.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/events/event_handler.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 class TestModalDialogDelegate : public views::DialogDelegateView {
  public:
@@ skipping 118 matching lines @@
   CountingEventHandler handler(&mouse_events);
   overlay_window->AddPreTargetHandler(&handler);
   GetEventGenerator().PressLeftButton();
   GetEventGenerator().ReleaseLeftButton();
   EXPECT_EQ(mouse_events, 2);
   overlay_window->RemovePreTargetHandler(&handler);
 }
 
 }  // namespace test
 }  // namespace ash