| Index: ash/root_window_controller_unittest.cc
|
| diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
|
| index 8da08162328beb4b326b19583d2e2a9bf6bf5b66..48aadbd3d6419c4de5b705848184ba2e00089db9 100644
|
| --- a/ash/root_window_controller_unittest.cc
|
| +++ b/ash/root_window_controller_unittest.cc
|
| @@ -1236,16 +1236,9 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ZOrderTest) {
|
| menu.reset();
|
| }
|
|
|
| -// Resolution in UpdateDisplay is not being respected on Windows 8.
|
| -#if defined(OS_WIN)
|
| -#define MAYBE_DisplayRotation DISABLED_DisplayRotation
|
| -#else
|
| -#define MAYBE_DisplayRotation DisplayRotation
|
| -#endif
|
| -
|
| // Tests that the virtual keyboard correctly resizes with a change to display
|
| // orientation. See crbug/417612.
|
| -TEST_F(VirtualKeyboardRootWindowControllerTest, MAYBE_DisplayRotation) {
|
| +TEST_F(VirtualKeyboardRootWindowControllerTest, DisplayRotation) {
|
| UpdateDisplay("800x600");
|
| aura::Window* root_window = Shell::GetPrimaryRootWindow();
|
| aura::Window* keyboard_container =
|
|
|