Skip mulitple-dispay tests on win8

ash/wm/activation_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/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
@@ skipping 515 matching lines @@
       Shell::GetContainer(Shell::GetPrimaryRootWindow(), c3);
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
     &wd, -1, gfx::Rect(50, 50, 50, 50), lock_container));
 
   lock_container->layer()->SetVisible(false);
   w1->Focus();
   EXPECT_TRUE(w1->HasFocus());
 }
 
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_NextActiveWindowOnMultipleDisplays \
-        DISABLED_NextActiveWindowOnMultipleDisplays
-#else
-#define MAYBE_NextActiveWindowOnMultipleDisplays \
-        NextActiveWindowOnMultipleDisplays
-#endif
-
 // Verifies that a next active window is chosen from current
 // active display.
-TEST_F(ActivationControllerTest, MAYBE_NextActiveWindowOnMultipleDisplays) {
+TEST_F(ActivationControllerTest, NextActiveWindowOnMultipleDisplays) {
+  if (!SupportsMultipleDisplays())
+    return;
+
   UpdateDisplay("300x300,300x300");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   scoped_ptr<aura::Window> w1_d1(CreateTestWindowInShellWithBounds(
       gfx::Rect(10, 10, 100, 100)));
   scoped_ptr<aura::Window> w2_d1(CreateTestWindowInShellWithBounds(
       gfx::Rect(20, 20, 100, 100)));
 
   EXPECT_EQ(root_windows[0], w1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], w2_d1->GetRootWindow());
@@ skipping 14 matching lines @@
   EXPECT_EQ(w2_d1.get(), client->GetActiveWindow());
 
   client->ActivateWindow(w3_d2.get());
   EXPECT_EQ(w3_d2.get(), client->GetActiveWindow());
   w3_d2.reset();
   EXPECT_EQ(w4_d2.get(), client->GetActiveWindow());
 }
 
 }  // namespace test
 }  // namespace ash