Move TestEventHandler to ui/events/test

ash/wm/immersive_fullscreen_controller_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/wm/immersive_fullscreen_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.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/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 37 matching lines @@
   }
 
  private:
   views::View* top_container_view_;
   bool enabled_;
   double visible_fraction_;
 
   DISALLOW_COPY_AND_ASSIGN(MockImmersiveFullscreenControllerDelegate);
 };
 
-class ConsumeEventHandler : public aura::test::TestEventHandler {
+class ConsumeEventHandler : public ui::test::TestEventHandler {
  public:
   ConsumeEventHandler() {}
   virtual ~ConsumeEventHandler() {}
 
  private:
   virtual void OnEvent(ui::Event* event) OVERRIDE {
-    aura::test::TestEventHandler::OnEvent(event);
+    ui::test::TestEventHandler::OnEvent(event);
     if (event->cancelable())
       event->SetHandled();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ConsumeEventHandler);
 };
 
 }  // namespace
 
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 951 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey,
                         ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 }  // namespase ash