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

ui/views/corewm/desktop_capture_controller_unittest.cc

 // Copyright (c) 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 "ui/wm/core/capture_controller.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "ui/aura/env.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/events/event.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 // NOTE: these tests do native capture, so they have to be in
 // interactive_ui_tests.
@@ skipping 53 matching lines @@
   widget->Show();
   return widget;
 }
 
 // Verifies mouse handlers are reset when a window gains capture. Specifically
 // creates two widgets, does a mouse press in one, sets capture in the other and
 // verifies state is reset in the first.
 TEST_F(DesktopCaptureControllerTest, ResetMouseHandlers) {
   scoped_ptr<Widget> w1(CreateWidget());
   scoped_ptr<Widget> w2(CreateWidget());
-  aura::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
+  ui::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
   generator1.MoveMouseToCenterOf(w1->GetNativeView());
   generator1.PressLeftButton();
   EXPECT_FALSE(w1->HasCapture());
   aura::WindowEventDispatcher* w1_dispatcher =
       w1->GetNativeView()->GetHost()->dispatcher();
   EXPECT_TRUE(w1_dispatcher->mouse_pressed_handler() != NULL);
   EXPECT_TRUE(w1_dispatcher->mouse_moved_handler() != NULL);
   w2->SetCapture(w2->GetRootView());
   EXPECT_TRUE(w2->HasCapture());
   EXPECT_TRUE(w1_dispatcher->mouse_pressed_handler() == NULL);
@@ skipping 93 matching lines @@
 
   EXPECT_TRUE(v2->received_gesture_event());
   EXPECT_FALSE(v1->received_gesture_event());
 
   widget1->CloseNow();
   widget2->CloseNow();
   RunPendingMessages();
 }
 
 }  // namespace views