| Index: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
|
| index b3724c88652a76cb4dff2285ca6ea8c7c8117a9b..98da2bc5129f2f0172f6b39d57787c3cce180f30 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
|
| @@ -10,8 +10,6 @@
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/test/display_manager_test_api.h"
|
| -#include "ash/test/test_lock_state_controller_delegate.h"
|
| -#include "ash/test/test_screenshot_delegate.h"
|
| #include "ash/test/test_system_tray_delegate.h"
|
| #include "ash/test/test_volume_control_delegate.h"
|
| #include "ash/wm/maximize_mode/internal_input_device_list.h"
|
| @@ -392,36 +390,6 @@ TEST_F(MaximizeModeControllerTest, BlocksKeyboardAndMouse) {
|
| counter.reset();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -// Tests that a screenshot can be taken in maximize mode by holding volume down
|
| -// and pressing power.
|
| -TEST_F(MaximizeModeControllerTest, Screenshot) {
|
| - Shell::GetInstance()->lock_state_controller()->SetDelegate(
|
| - new test::TestLockStateControllerDelegate);
|
| - aura::Window* root = Shell::GetPrimaryRootWindow();
|
| - aura::test::EventGenerator event_generator(root, root);
|
| - test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
|
| - delegate->set_can_take_screenshot(true);
|
| -
|
| - // Open up 270 degrees.
|
| - TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
|
| - gfx::Vector3dF(1.0f, 0.0f, 0.0f));
|
| - ASSERT_TRUE(IsMaximizeModeStarted());
|
| -
|
| - // Pressing power alone does not take a screenshot.
|
| - event_generator.PressKey(ui::VKEY_POWER, 0);
|
| - event_generator.ReleaseKey(ui::VKEY_POWER, 0);
|
| - EXPECT_EQ(0, delegate->handle_take_screenshot_count());
|
| -
|
| - // Holding volume down and pressing power takes a screenshot.
|
| - event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0);
|
| - event_generator.PressKey(ui::VKEY_POWER, 0);
|
| - event_generator.ReleaseKey(ui::VKEY_POWER, 0);
|
| - EXPECT_EQ(1, delegate->handle_take_screenshot_count());
|
| - event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0);
|
| -}
|
| -#endif // OS_CHROMEOS
|
| -
|
| #if defined(USE_X11)
|
| // Tests that maximize mode allows volume up/down events originating
|
| // from dedicated buttons versus remapped keyboard buttons.
|
|
|