Let layout tests run on Windows 7.

webkit/tools/test_shell/test_shell_platform_delegate_win.cc

 // Copyright (c) 2009 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 <string>
 #include <list>
 #include <windows.h>
 #include <commctrl.h>
 
 #include "app/gfx/native_theme_win.h"
@@ skipping 34 matching lines @@
   std::list<std::string> errors;
 
   OSVERSIONINFOEX osvi;
   ::ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
   osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
   ::GetVersionEx((OSVERSIONINFO *)&osvi);
 
   // default to XP metrics, override if on Vista
   int requiredVScrollSize = 17;
   int requiredFontSize = -11; // 8 pt
-  const WCHAR *requiredFont = L"Tahoma";
+  const wchar_t* requiredFont = L"Tahoma";
+  // Consider Windows 7 as Vista.
   bool isVista = false;
   if (osvi.dwMajorVersion == 6
-      && osvi.dwMinorVersion == 0
+      && (osvi.dwMinorVersion == 0 || osvi.dwMinorVersion == 1)
       && osvi.wProductType == VER_NT_WORKSTATION) {
     requiredFont = L"Segoe UI";
     requiredFontSize = -12; // 9 pt
     isVista = true;
   } else if (osvi.dwMajorVersion == 5
              && osvi.dwMinorVersion == 1
              && osvi.wProductType == VER_NT_WORKSTATION) {
     // XP;
   } else {
     errors.push_back("Unsupported Operating System version "
@@ skipping 72 matching lines @@
 void TestShellPlatformDelegate::SetWindowPositionForRecording(
     TestShell *shell) {
   // Move the window to the upper left corner for consistent
   // record/playback mode.  For automation, we want this to work
   // on build systems where the script invoking us is a background
   // process.  So for this case, make our window the topmost window
   // as well.
   ForegroundHelper::SetForeground(shell->mainWnd());
   ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
 }