Move TestEventHandler to ui/events/test

ash/wm/window_manager_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.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/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/input_method_event_filter.h"
 
 namespace {
 
 class TestingCursorClientObserver : public aura::client::CursorClientObserver {
  public:
   TestingCursorClientObserver()
       : cursor_visibility_(false),
@@ skipping 14 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestingCursorClientObserver);
 };
 
 base::TimeDelta getTime() {
   return ui::EventTimeForNow();
 }
 
 // A slightly changed TestEventHandler which can be configured to return a
 // specified value for key/mouse event handling.
-class CustomEventHandler : public aura::test::TestEventHandler {
+class CustomEventHandler : public ui::test::TestEventHandler {
  public:
   CustomEventHandler()
       : key_result_(ui::ER_UNHANDLED),
         mouse_result_(ui::ER_UNHANDLED) {
   }
 
   virtual ~CustomEventHandler() {}
 
   void set_key_event_handling_result(ui::EventResult result) {
     key_result_ = result;
   }
 
   void set_mouse_event_handling_result(ui::EventResult result) {
     mouse_result_ = result;
   }
 
   // Overridden from ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
-    aura::test::TestEventHandler::OnKeyEvent(event);
+    ui::test::TestEventHandler::OnKeyEvent(event);
     if (key_result_ & ui::ER_HANDLED)
       event->SetHandled();
     if (key_result_ & ui::ER_CONSUMED)
       event->StopPropagation();
   }
 
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
-    aura::test::TestEventHandler::OnMouseEvent(event);
+    ui::test::TestEventHandler::OnMouseEvent(event);
     if (mouse_result_ & ui::ER_HANDLED)
       event->SetHandled();
     if (mouse_result_ & ui::ER_CONSUMED)
       event->StopPropagation();
   }
 
  private:
   ui::EventResult key_result_;
   ui::EventResult mouse_result_;
 
@@ skipping 733 matching lines @@
   observer_a.reset();
   observer_b.reset();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash