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

ui/wm/core/focus_controller_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 "ui/wm/core/focus_controller.h"
 
 #include <map>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/wm_state.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace wm {
 
 class FocusNotificationObserver : public aura::client::ActivationChangeObserver,
                                   public aura::client::FocusChangeObserver {
  public:
@@ skipping 731 matching lines @@
         new aura::client::DefaultCaptureClient(root_window()));
     // Clicking on a window which has capture should not cause a focus change
     // to the window. This test verifies whether that is indeed the case.
     ActivateWindowById(1);
 
     EXPECT_EQ(1, GetActiveWindowId());
     EXPECT_EQ(1, GetFocusedWindowId());
 
     aura::Window* w2 = root_window()->GetChildById(2);
     aura::client::GetCaptureClient(root_window())->SetCapture(w2);
-    aura::test::EventGenerator generator(root_window(), w2);
+    ui::test::EventGenerator generator(root_window(), w2);
     generator.ClickLeftButton();
 
     EXPECT_EQ(1, GetActiveWindowId());
     EXPECT_EQ(1, GetFocusedWindowId());
     aura::client::GetCaptureClient(root_window())->ReleaseCapture(w2);
   }
 
   // Verifies focus change is honored while capture held.
   virtual void ChangeFocusWhenNothingFocusedAndCaptured() OVERRIDE {
     scoped_ptr<aura::client::DefaultCaptureClient> capture_client(
@@ skipping 116 matching lines @@
  public:
   FocusControllerMouseEventTest() {}
 
   // Tests that a handled mouse or gesture event does not trigger a window
   // activation.
   void IgnoreHandledEvent() {
     EXPECT_EQ(NULL, GetActiveWindow());
     aura::Window* w1 = root_window()->GetChildById(1);
     SimpleEventHandler handler;
     root_window()->PrependPreTargetHandler(&handler);
-    aura::test::EventGenerator generator(root_window(), w1);
+    ui::test::EventGenerator generator(root_window(), w1);
     generator.ClickLeftButton();
     EXPECT_EQ(NULL, GetActiveWindow());
     generator.GestureTapAt(w1->bounds().CenterPoint());
     EXPECT_EQ(NULL, GetActiveWindow());
     root_window()->RemovePreTargetHandler(&handler);
     generator.ClickLeftButton();
     EXPECT_EQ(1, GetActiveWindowId());
   }
 
  private:
   // Overridden from FocusControllerTestBase:
   virtual void FocusWindowDirect(aura::Window* window) OVERRIDE {
-    aura::test::EventGenerator generator(root_window(), window);
+    ui::test::EventGenerator generator(root_window(), window);
     generator.ClickLeftButton();
   }
   virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE {
-    aura::test::EventGenerator generator(root_window(), window);
+    ui::test::EventGenerator generator(root_window(), window);
     generator.ClickLeftButton();
   }
   virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::Window* next_activatable =
         test_focus_rules()->GetNextActivatableWindow(window);
-    aura::test::EventGenerator generator(root_window(), next_activatable);
+    ui::test::EventGenerator generator(root_window(), next_activatable);
     generator.ClickLeftButton();
   }
   virtual bool IsInputEvent() OVERRIDE { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerMouseEventTest);
 };
 
 class FocusControllerGestureEventTest : public FocusControllerDirectTestBase {
  public:
   FocusControllerGestureEventTest() {}
 
  private:
   // Overridden from FocusControllerTestBase:
   virtual void FocusWindowDirect(aura::Window* window) OVERRIDE {
-    aura::test::EventGenerator generator(root_window(), window);
+    ui::test::EventGenerator generator(root_window(), window);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
   virtual void ActivateWindowDirect(aura::Window* window) OVERRIDE {
-    aura::test::EventGenerator generator(root_window(), window);
+    ui::test::EventGenerator generator(root_window(), window);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
   virtual void DeactivateWindowDirect(aura::Window* window) OVERRIDE {
     aura::Window* next_activatable =
         test_focus_rules()->GetNextActivatableWindow(window);
-    aura::test::EventGenerator generator(root_window(), next_activatable);
+    ui::test::EventGenerator generator(root_window(), next_activatable);
     generator.GestureTapAt(window->bounds().CenterPoint());
   }
   virtual bool IsInputEvent() OVERRIDE { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerGestureEventTest);
 };
 
 // Test base for tests where focus is implicitly set to a window as the result
 // of a disposition change to the focused window or the hierarchy that contains
 // it.
@@ skipping 305 matching lines @@
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow);
 
 // - Verifies that the focused text input client is cleard when the window focus
 //   changes.
 ALL_FOCUS_TESTS(FocusedTextInputClient);
 
 // If a mouse event was handled, it should not activate a window.
 FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent);
 
 }  // namespace wm