Change port to use apache by default on win7, update test expectations.

Tools/Scripts/webkitpy/layout_tests/port/win.py

Index: Tools/Scripts/webkitpy/layout_tests/port/win.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/win.py b/Tools/Scripts/webkitpy/layout_tests/port/win.py
index 38be6bf1b1ce5d2c8afe73df5a6933b7ea5b16f5..7bd32c3c7158598d9535c26ca880f47017ec2551 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/win.py
@@ -90,7 +90,7 @@ class WinPort(base.Port):
 
     def check_httpd(self):
         res = super(WinPort, self).check_httpd()
-        if self.get_option('use_apache'):
+        if self.uses_apache():
             # In order to run CGI scripts on Win32 that use unix shebang lines, we need to
             # create entries in the registry that remap the extensions (.pl and .cgi) to the
             # appropriate Win32 paths. The command line arguments must match the command
@@ -164,9 +164,6 @@ class WinPort(base.Port):
             if key not in env and (not use_apache or key in apache_envvars):
                 env[key] = value
 
-        if use_apache:
-            return env
-
         # Put the cygwin directory first in the path to find cygwin1.dll.
         env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cygwin", "bin"), env["PATH"])
         # Configure the cygwin directory so that pywebsocket finds proper
@@ -203,7 +200,10 @@ class WinPort(base.Port):
         return path.replace('\\', '/')
 
     def uses_apache(self):
-        return self.get_option('use_apache')
+        val = self.get_option('use_apache')
+        if val is None:
+            val = bool(self.version() != 'xp')
+        return val
 
     def path_to_apache(self):
         return self.path_from_chromium_base('third_party', 'apache-win32', 'bin', 'httpd.exe')