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

athena/input/accelerator_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/input/public/accelerator_manager.h"
 
 #include "athena/input/public/input_manager.h"
 #include "athena/test/athena_test_base.h"
-#include "ui/aura/test/event_generator.h"
+#include "ui/events/test/event_generator.h"
 
 namespace athena {
 namespace {
 
 const int kInvalidCommandId = -1;
 
 class TestHandler : public AcceleratorHandler {
  public:
   TestHandler() : fired_command_id_(kInvalidCommandId), enabled_(true) {}
   virtual ~TestHandler() {}
@@ skipping 44 matching lines @@
       {TRIGGER_ON_PRESS, ui::VKEY_D, ui::EF_SHIFT_DOWN, COMMAND_D,
        AF_RESERVED | AF_NON_AUTO_REPEATABLE},
       {TRIGGER_ON_PRESS, ui::VKEY_E, ui::EF_SHIFT_DOWN, COMMAND_E, AF_NONE},
   };
   AcceleratorManager* accelerator_manager =
       InputManager::Get()->GetAcceleratorManager();
   TestHandler test_handler;
   accelerator_manager->RegisterAccelerators(
       data, arraysize(data), &test_handler);
 
-  aura::test::EventGenerator generator(root_window());
+  ui::test::EventGenerator generator(root_window());
   generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset());
 
   // Trigger on press.
   generator.PressKey(ui::VKEY_A, ui::EF_SHIFT_DOWN);
   EXPECT_EQ(COMMAND_A, test_handler.GetFiredCommandIdAndReset());
   generator.ReleaseKey(ui::VKEY_A, ui::EF_SHIFT_DOWN);
   EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset());
 
   // Trigger on release.
@@ skipping 25 matching lines @@
   generator.PressKey(ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_IS_REPEAT);
   EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset());
 
   // TODO(oshima): Add scenario where the key event is consumed by
   // an app.
   generator.PressKey(ui::VKEY_E, ui::EF_SHIFT_DOWN);
   EXPECT_EQ(COMMAND_E, test_handler.GetFiredCommandIdAndReset());
 }
 
 }  // namespace athena