| Index: ash/accelerators/accelerator_filter_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
|
| index 9c9a7e482d81ed1a386d5d6523934d5929969ffe..f19204b80440b70fc2246a38e8eb6ec799db4031 100644
|
| --- a/ash/accelerators/accelerator_filter_unittest.cc
|
| +++ b/ash/accelerators/accelerator_filter_unittest.cc
|
| @@ -35,6 +35,10 @@ typedef AshTestBase AcceleratorFilterTest;
|
|
|
| // Tests if AcceleratorFilter works without a focused window.
|
| TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {
|
| + // TODO: mash doesn't support ScreenshotDelgate yet. http://crbug.com/632111.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| const TestScreenshotDelegate* delegate = GetScreenshotDelegate();
|
| EXPECT_EQ(0, delegate->handle_take_screenshot_count());
|
|
|
| @@ -49,6 +53,10 @@ TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {
|
|
|
| // Tests if AcceleratorFilter works as expected with a focused window.
|
| TEST_F(AcceleratorFilterTest, TestFilterWithFocus) {
|
| + // TODO: mash doesn't support ScreenshotDelgate yet. http://crbug.com/632111.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| aura::test::TestWindowDelegate test_delegate;
|
| std::unique_ptr<aura::Window> window(
|
| CreateTestWindowInShellWithDelegate(&test_delegate, -1, gfx::Rect()));
|
| @@ -71,6 +79,10 @@ TEST_F(AcceleratorFilterTest, TestFilterWithFocus) {
|
|
|
| // Tests if AcceleratorFilter ignores the flag for Caps Lock.
|
| TEST_F(AcceleratorFilterTest, TestCapsLockMask) {
|
| + // TODO: mash doesn't support ScreenshotDelgate yet. http://crbug.com/632111.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| const TestScreenshotDelegate* delegate = GetScreenshotDelegate();
|
| EXPECT_EQ(0, delegate->handle_take_screenshot_count());
|
|
|
|
|