diff options
Diffstat (limited to 'ash/accelerators/accelerator_filter_unittest.cc')
| -rw-r--r-- | ash/accelerators/accelerator_filter_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc index 67ff1d9..d91d084 100644 --- a/ash/accelerators/accelerator_filter_unittest.cc +++ b/ash/accelerators/accelerator_filter_unittest.cc @@ -15,10 +15,10 @@ #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/test/aura_test_base.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/events/event.h" +#include "ui/events/test/event_generator.h" #include "ui/gfx/rect.h" namespace ash { @@ -31,7 +31,7 @@ TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) { const TestScreenshotDelegate* delegate = GetScreenshotDelegate(); EXPECT_EQ(0, delegate->handle_take_screenshot_count()); - aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); // AcceleratorController calls ScreenshotDelegate::HandleTakeScreenshot() when // VKEY_PRINT is pressed. See kAcceleratorData[] in accelerator_controller.cc. generator.PressKey(ui::VKEY_PRINT, 0); @@ -54,7 +54,7 @@ TEST_F(AcceleratorFilterTest, TestFilterWithFocus) { // AcceleratorFilter should ignore the key events since the root window is // not focused. - aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.PressKey(ui::VKEY_PRINT, 0); EXPECT_EQ(0, delegate->handle_take_screenshot_count()); generator.ReleaseKey(ui::VKEY_PRINT, 0); @@ -69,7 +69,7 @@ TEST_F(AcceleratorFilterTest, TestCapsLockMask) { const TestScreenshotDelegate* delegate = GetScreenshotDelegate(); EXPECT_EQ(0, delegate->handle_take_screenshot_count()); - aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.PressKey(ui::VKEY_PRINT, 0); EXPECT_EQ(1, delegate->handle_take_screenshot_count()); generator.ReleaseKey(ui::VKEY_PRINT, 0); |