Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: ash/accelerators/accelerator_filter_unittest.cc

Issue 2713923002: chromeos: moves a bunch of tests to common_unittests (Closed)
Patch Set: feedback Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/BUILD.gn ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « ash/BUILD.gn ('k') | ash/autoclick/autoclick_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698