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

athena/screen/screen_manager_unittest.cc

 // Copyright 2014 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 "athena/screen/public/screen_manager.h"
 
 #include <algorithm>
 #include <string>
 
 #include "athena/common/container_priorities.h"
 #include "athena/test/athena_test_base.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/wm/core/window_util.h"
 
 typedef athena::test::AthenaTestBase ScreenManagerTest;
 
 namespace athena {
 namespace {
 
 const int kTestZOrderPriority = 10;
 
 aura::Window* Create(const std::string& name, int z_order_priority) {
@@ skipping 92 matching lines @@
   normal_params.can_activate_children = true;
   aura::Window* normal_container =
       ScreenManager::Get()->CreateContainer(normal_params);
 
   aura::test::EventCountDelegate normal_delegate;
   scoped_ptr<aura::Window> normal_window(CreateTestWindow(
       normal_container, &normal_delegate, gfx::Rect(0, 0, 100, 100)));
 
   EXPECT_TRUE(wm::CanActivateWindow(normal_window.get()));
   wm::ActivateWindow(normal_window.get());
-  aura::test::EventGenerator event_generator(root_window());
+  ui::test::EventGenerator event_generator(root_window());
   event_generator.MoveMouseTo(0, 0);
   event_generator.ClickLeftButton();
   EXPECT_EQ("1 1", normal_delegate.GetMouseButtonCountsAndReset());
   event_generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   event_generator.ReleaseKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_EQ("1 1", normal_delegate.GetKeyCountsAndReset());
 
   ScreenManager::ContainerParams grab_params(
       "grabbing", kTestZOrderPriority + 1);
   grab_params.can_activate_children = true;
@@ skipping 44 matching lines @@
   ScreenManager::ContainerParams vk_params(
       "virtual keyboard", kTestZOrderPriority + 1);
   vk_params.can_activate_children = true;
   aura::Window* vk_container = ScreenManager::Get()->CreateContainer(vk_params);
 
   aura::test::EventCountDelegate vk_delegate;
   scoped_ptr<aura::Window> vk_window(CreateTestWindow(
       vk_container, &vk_delegate, gfx::Rect(0, 20, 100, 80)));
   EXPECT_TRUE(wm::CanActivateWindow(vk_window.get()));
 
-  aura::test::EventGenerator event_generator(root_window());
+  ui::test::EventGenerator event_generator(root_window());
   event_generator.MoveMouseTo(10, 25);
   event_generator.ClickLeftButton();
   EXPECT_EQ("0 0", grab_delegate.GetMouseButtonCountsAndReset());
   EXPECT_EQ("1 1", vk_delegate.GetMouseButtonCountsAndReset());
 }
 
 TEST_F(ScreenManagerTest, GrabAndMouseCapture) {
   ScreenManager::ContainerParams normal_params(
       "normal", kTestZOrderPriority);
   normal_params.can_activate_children = true;
   aura::Window* normal_container =
       ScreenManager::Get()->CreateContainer(normal_params);
 
   aura::test::EventCountDelegate normal_delegate;
   scoped_ptr<aura::Window> normal_window(CreateTestWindow(
       normal_container, &normal_delegate, gfx::Rect(0, 0, 100, 100)));
 
-  aura::test::EventGenerator event_generator(root_window());
+  ui::test::EventGenerator event_generator(root_window());
   event_generator.MoveMouseTo(0, 0);
   event_generator.PressLeftButton();
 
   // Creating grabbing container while mouse pressing.
   ScreenManager::ContainerParams grab_params(
       "grabbing", kTestZOrderPriority + 1);
   grab_params.can_activate_children = true;
   grab_params.grab_inputs = true;
   aura::Window* grab_container =
       ScreenManager::Get()->CreateContainer(grab_params);
 
   aura::test::EventCountDelegate grab_delegate;
   scoped_ptr<aura::Window> grab_window(CreateTestWindow(
       grab_container, &grab_delegate, gfx::Rect(10, 10, 100, 100)));
 
   // Release event should be sent to |normal_window| because it captures the
   // mouse event.
   event_generator.ReleaseLeftButton();
   EXPECT_EQ("1 1", normal_delegate.GetMouseButtonCountsAndReset());
   EXPECT_EQ("0 0", grab_delegate.GetMouseButtonCountsAndReset());
 
   // After release, further mouse events should not be sent to |normal_window|
   // because grab_container grabs the input.
   event_generator.ClickLeftButton();
   EXPECT_EQ("0 0", normal_delegate.GetMouseButtonCountsAndReset());
   EXPECT_EQ("0 0", grab_delegate.GetMouseButtonCountsAndReset());
 }
 
 }  // namespace athena