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

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/display/mouse_cursor_event_filter.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 "ash/wm/window_state.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_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/event_generator.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 191 matching lines @@
     // Compute the event position in |top_container_| coordinates.
     gfx::Point event_position(0, revealed ? 0 : top_container_->height() + 100);
     switch (modality) {
       case MODALITY_MOUSE: {
         MoveMouse(event_position.x(), event_position.y());
         break;
       }
       case MODALITY_GESTURE_TAP: {
         gfx::Point screen_position = event_position;
         views::View::ConvertPointToScreen(top_container_, &screen_position);
-        aura::test::EventGenerator& event_generator(GetEventGenerator());
+        ui::test::EventGenerator& event_generator(GetEventGenerator());
         event_generator.MoveTouch(event_position);
         event_generator.PressTouch();
         event_generator.ReleaseTouch();
         break;
       }
       case MODALITY_GESTURE_SCROLL: {
         gfx::Point start(0, revealed ? 0 : top_container_->height() - 2);
         gfx::Vector2d scroll_delta(0, 40);
         gfx::Point end = revealed ? start + scroll_delta : start - scroll_delta;
         views::View::ConvertPointToScreen(top_container_, &start);
         views::View::ConvertPointToScreen(top_container_, &end);
-        aura::test::EventGenerator& event_generator(GetEventGenerator());
+        ui::test::EventGenerator& event_generator(GetEventGenerator());
         event_generator.GestureScrollSequence(
             start, end,
             base::TimeDelta::FromMilliseconds(30), 1);
         break;
       }
     }
   }
 
   scoped_ptr<ImmersiveFullscreenController> controller_;
   scoped_ptr<MockImmersiveFullscreenControllerDelegate> delegate_;
@@ skipping 85 matching lines @@
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test mouse event processing for top-of-screen reveal triggering.
 TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
   // Set up initial state.
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
   ASSERT_FALSE(controller()->IsRevealed());
 
-  aura::test::EventGenerator& event_generator(GetEventGenerator());
+  ui::test::EventGenerator& event_generator(GetEventGenerator());
 
   gfx::Rect top_container_bounds_in_screen =
       top_container()->GetBoundsInScreen();
   // A position along the top edge of TopContainerView in screen coordinates.
   gfx::Point top_edge_pos(top_container_bounds_in_screen.x() + 100,
                           top_container_bounds_in_screen.y());
 
   // Mouse wheel event does nothing.
   ui::MouseEvent wheel(
       ui::ET_MOUSEWHEEL, top_edge_pos, top_edge_pos, ui::EF_NONE, ui::EF_NONE);
@@ skipping 158 matching lines @@
             top_container()->GetWidget()->GetNativeWindow()->GetRootWindow());
 
   gfx::Rect primary_root_window_bounds_in_screen =
       root_windows[0]->GetBoundsInScreen();
   // Do not set |x| to the root window's x position because the display's
   // corners have special behavior.
   int x = primary_root_window_bounds_in_screen.x() + 10;
   // The y position of the top edge of the primary display.
   int y_top_edge = primary_root_window_bounds_in_screen.y();
 
-  aura::test::EventGenerator& event_generator(GetEventGenerator());
+  ui::test::EventGenerator& event_generator(GetEventGenerator());
 
   // Moving right below the top edge starts the hover timer running. We
   // cannot use MoveMouse() because MoveMouse() stops the timer if it started
   // running.
   event_generator.MoveMouseTo(x, y_top_edge + 1);
   EXPECT_TRUE(top_edge_hover_timer_running());
   EXPECT_EQ(y_top_edge + 1,
             aura::Env::GetInstance()->last_mouse_location().y());
 
   // The timer should continue running if the user moves the mouse to the top
@@ skipping 525 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