summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authortbarzic <tbarzic@chromium.org>2015-04-01 13:02:41 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-01 20:03:36 +0000
commit34561adb6644f4256b41bf1e300edb0e03ddb2c4 (patch)
treee3c736aa6418f13d874495c2f11fafcfe9ecba0e /ash
parent84c493e65d1fe259dcb3cbf6028f883ef7a92c89 (diff)
downloadchromium_src-34561adb6644f4256b41bf1e300edb0e03ddb2c4.zip
chromium_src-34561adb6644f4256b41bf1e300edb0e03ddb2c4.tar.gz
chromium_src-34561adb6644f4256b41bf1e300edb0e03ddb2c4.tar.bz2
Disable AcceleratorInteractiveUITest.ChromeOsAccelerators on cros_trunk
The rest of the AcceleratorInteractiveUITests were disabled on officail builds in https://crrev.com/c325afc591b830f15382902f9eaa82e905dc2bbe looks like this one was missed. TEST=None BUG=None Review URL: https://codereview.chromium.org/1051943002 Cr-Commit-Position: refs/heads/master@{#323306}
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_interactive_uitest_chromeos.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
index 4bb7d16..74cfe1c 100644
--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -166,7 +166,7 @@ TEST_F(AcceleratorInteractiveUITest, MAYBE_NonRepeatableNeedingWindowActions) {
}
// Tests a sample of ChromeOS specific accelerators.
-TEST_F(AcceleratorInteractiveUITest, ChromeOsAccelerators) {
+TEST_F(AcceleratorInteractiveUITest, MAYBE_ChromeOsAccelerators) {
// Test TAKE_SCREENSHOT and TAKE_PARTIAL_SCREENSHOT.
TestScreenshotDelegate* screenshot_delegate = GetScreenshotDelegate();
screenshot_delegate->set_can_take_screenshot(true);