Move TestEventHandler to ui/events/test

ash/wm/system_gesture_event_filter_unittest.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 "ash/wm/system_gesture_event_filter.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 class ResizableWidgetDelegate : public views::WidgetDelegateView {
@@ skipping 525 matching lines @@
 
   aura::test::EventCountDelegate delegate;
   delegate.set_window_component(HTCLIENT);
   scoped_ptr<aura::Window> child(new aura::Window(&delegate));
   child->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   child->Init(aura::WINDOW_LAYER_TEXTURED);
   parent->AddChild(child.get());
   child->SetBounds(gfx::Rect(100, 100));
   child->Show();
 
-  aura::test::TestEventHandler event_handler;
+  ui::test::TestEventHandler event_handler;
   aura::Env::GetInstance()->PrependPreTargetHandler(&event_handler);
 
   GetEventGenerator().MoveMouseTo(0, 0);
   for (int i = 1; i <= 3; ++i)
     GetEventGenerator().PressTouchId(i);
   for (int i = 1; i <= 3; ++i)
     GetEventGenerator().ReleaseTouchId(i);
   EXPECT_EQ(event_handler.num_gesture_events(),
             delegate.GetGestureCountAndReset());
 
   aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 // Tests run twice - with docked windows disabled or enabled.
 INSTANTIATE_TEST_CASE_P(DockedWindowsDisabledOrEnabled,
                         SystemGestureEventFilterTest,
                         testing::Bool());
 
 }  // namespace test
 }  // namespace ash