Skip mulitple-dispay tests on win8

ash/root_window_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 100 matching lines @@
     return widget;
   }
 
   aura::Window* GetModalContainer(aura::RootWindow* root_window) {
     return Shell::GetContainer(
         root_window,
         ash::internal::kShellWindowId_SystemModalContainer);
   }
 };
 
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_MoveWindows_Basic DISABLED_MoveWindows_Basic
-#else
-#define MAYBE_MoveWindows_Basic MoveWindows_Basic
-#endif
+TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
+  RETURN_IF_WIN8;
 
-TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Basic) {
   UpdateDisplay("600x600,500x500");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   internal::RootWindowController* controller =
       Shell::GetPrimaryRootWindowController();
   internal::ShelfLayoutManager* shelf_layout_manager =
       controller->GetShelfLayoutManager();
   shelf_layout_manager->SetAutoHideBehavior(
       ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
@@ skipping 95 matching lines @@
   EXPECT_EQ(root_windows[0],
             unparented_control->GetNativeView()->GetRootWindow());
   EXPECT_EQ(internal::kShellWindowId_UnparentedControlContainer,
             unparented_control->GetNativeView()->parent()->id());
 
   // Test if the panel has moved.
   EXPECT_EQ(root_windows[0], panel->GetRootWindow());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, panel->parent()->id());
 }
 
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_MoveWindows_Modal DISABLED_MoveWindows_Modal
-#else
-#define MAYBE_MoveWindows_Modal MoveWindows_Modal
-#endif
+TEST_F(RootWindowControllerTest, MoveWindows_Modal) {
+  RETURN_IF_WIN8;
 
-TEST_F(RootWindowControllerTest, MAYBE_MoveWindows_Modal) {
   UpdateDisplay("500x500,500x500");
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   // Emulate virtual screen coordinate system.
   root_windows[0]->SetBounds(gfx::Rect(0, 0, 500, 500));
   root_windows[1]->SetBounds(gfx::Rect(500, 0, 500, 500));
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(root_windows[0], normal->GetNativeView()->GetRootWindow());
   EXPECT_TRUE(wm::IsActiveWindow(normal->GetNativeView()));
@@ skipping 129 matching lines @@
   w1->Activate();
   EXPECT_FALSE(controller->GetFullscreenWindow());
 
   // If the fullscreen window is active, GetFullscreenWindow() should find it.
   w2->Activate();
   EXPECT_EQ(w2->GetNativeWindow(), controller->GetFullscreenWindow());
 }
 
 }  // namespace test
 }  // namespace ash