diff options
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/interactive_ui/keyboard_access_uitest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc index 54054be..849571e 100644 --- a/chrome/test/interactive_ui/keyboard_access_uitest.cc +++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc @@ -117,9 +117,17 @@ TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) { TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN); } +// TODO(isherman): This test times out on ChromeOS. We should merge it with +// BrowserKeyEventsTest.ReservedAccelerators, but just disable for now. +#if defined(OS_CHROMEOS) +#define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators +#else +#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators +#endif + // Test that JavaScript cannot intercept reserved keyboard accelerators like // ctrl-t to open a new tab or ctrl-f4 to close a tab. -TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) { +TEST_F(KeyboardAccessTest, MAYBE_ReserveKeyboardAccelerators) { const std::string kBadPage = "<html><script>" "document.onkeydown = function() {" |