3rd part of porting Chrome Ash to Windows 7

ash/wm/workspace/workspace_event_handler_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_event_handler.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
@@ skipping 124 matching lines @@
   EXPECT_EQ(work_area.width(), bounds_in_screen.width());
   // Single-axis maximization is not considered real maximization.
   EXPECT_FALSE(window_state->IsMaximized());
 
   // Restore.
   generator.DoubleClickLeftButton();
   EXPECT_EQ(restored_bounds.ToString(), window->GetBoundsInScreen().ToString());
 
 #if defined(OS_WIN)
   // Multi display test does not run on Win8 bot. crbug.com/247427.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+  if (!SupportsMultipleDisplays())
     return;
 #endif
 
   // Verify the double clicking the resize edge works on 2nd display too.
   UpdateDisplay("200x200,400x300");
   gfx::Rect work_area2 = ScreenUtil::GetSecondaryDisplay().work_area();
   restored_bounds.SetRect(220, 20, 50, 50);
   window->SetBoundsInScreen(restored_bounds, ScreenUtil::GetSecondaryDisplay());
   aura::Window* second_root = Shell::GetAllRootWindows()[1];
   EXPECT_EQ(second_root, window->GetRootWindow());
@@ skipping 386 matching lines @@
   // Second click will go to the header
   delegate.set_window_component(HTCAPTION);
   generator.PressRightButton();
   generator.ReleaseRightButton();
   EXPECT_FALSE(window_state->IsMaximized());
   generator.DoubleClickLeftButton();
   EXPECT_FALSE(window_state->IsMaximized());
 }
 
 }  // namespace ash