Skip mulitple-dispay tests on win8

ash/wm/workspace/workspace_layout_manager_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/workspace/workspace_layout_manager.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/insets.h"
 
 namespace ash {
 
 namespace {
 
 typedef test::AshTestBase WorkspaceLayoutManagerTest;
 
-// Multi root doesn't work on Win8/metro. crbug.com/240628.
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_RestoreFromMinimizeKeepsRestore \
-  DISABLED_RestoreFromMinimizeKeepsRestore
-#else
-#define MAYBE_RestoreFromMinimizeKeepsRestore RestoreFromMinimizeKeepsRestore
-#endif
-
 // Verifies that a window containing a restore coordinate will be restored to
 // to the size prior to minimize, keeping the restore rectangle in tact (if
 // there is one).
-TEST_F(WorkspaceLayoutManagerTest, MAYBE_RestoreFromMinimizeKeepsRestore) {
+TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
   gfx::Rect bounds(10, 15, 25, 35);
   window->SetBounds(bounds);
   // This will not be used for un-minimizing window.
   SetRestoreBoundsInScreen(window.get(), gfx::Rect(0, 0, 100, 100));
   wm::MinimizeWindow(window.get());
   wm::RestoreWindow(window.get());
   EXPECT_EQ("0,0 100x100", GetRestoreBoundsInScreen(window.get())->ToString());
   EXPECT_EQ("10,15 25x35", window.get()->bounds().ToString());
 
+  if (!SupportsMultipleDisplays())
+    return;
+
   UpdateDisplay("400x300,500x400");
   window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100),
                             ScreenAsh::GetSecondaryDisplay());
   EXPECT_EQ(Shell::GetAllRootWindows()[1], window->GetRootWindow());
   wm::MinimizeWindow(window.get());
   // This will not be used for un-minimizing window.
   SetRestoreBoundsInScreen(window.get(), gfx::Rect(0, 0, 100, 100));
   wm::RestoreWindow(window.get());
   EXPECT_EQ("600,0 100x100", window->GetBoundsInScreen().ToString());
 
@@ skipping 118 matching lines @@
 
   // Directly setting the bounds triggers a slightly different code path. Verify
   // that too.
   window->SetBounds(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
       window->bounds().ToString());
 }
 
 }  // namespace
 }  // namespace ash