| Index: ash/wm/immersive_fullscreen_controller_unittest.cc
|
| diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| index 1c00bab395ee8276a7a244181801168f41e197f2..7adb754d51375483dcc00a4544b5462db7880357 100644
|
| --- a/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| @@ -662,16 +662,7 @@ TEST_F(ImmersiveFullscreenControllerTest, DifferentModalityEnterExit) {
|
| }
|
|
|
| // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
|
| -#if !defined(OS_CHROMEOS)
|
| -// On Windows/Linux, touch events do not result in mouse events being disabled.
|
| -// As a result, the last part of this test which ends the reveal via a gesture
|
| -// will not work correctly. See crbug.com/332430, and the function
|
| -// ShouldHideCursorOnTouch() in compound_event_filter.cc.
|
| -#define MAYBE_EndRevealViaGesture DISABLED_EndRevealViaGesture
|
| -#else
|
| -#define MAYBE_EndRevealViaGesture EndRevealViaGesture
|
| -#endif
|
| -TEST_F(ImmersiveFullscreenControllerTest, MAYBE_EndRevealViaGesture) {
|
| +TEST_F(ImmersiveFullscreenControllerTest, EndRevealViaGesture) {
|
| SetEnabled(true);
|
| EXPECT_TRUE(controller()->IsEnabled());
|
| EXPECT_FALSE(controller()->IsRevealed());
|
| @@ -777,10 +768,6 @@ TEST_F(ImmersiveFullscreenControllerTest, WindowStateImmersiveFullscreen) {
|
| EXPECT_FALSE(window_state->in_immersive_fullscreen());
|
| }
|
|
|
| -// Do not test under windows because focus testing is not reliable on
|
| -// Windows. (crbug.com/79493)
|
| -#if !defined(OS_WIN)
|
| -
|
| // Test how focus and activation affects whether the top-of-window views are
|
| // revealed.
|
| TEST_F(ImmersiveFullscreenControllerTest, Focus) {
|
| @@ -1016,8 +1003,6 @@ TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
|
| bubble_widget8->Close();
|
| }
|
|
|
| -#endif // defined(OS_WIN)
|
| -
|
| // Test that the shelf is set to auto hide as long as the window is in
|
| // immersive fullscreen and that the shelf's state before entering immersive
|
| // fullscreen is restored upon exiting immersive fullscreen.
|
|
|