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

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

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 72 matching lines @@
 
     def additional_drt_flag(self):
         flags = super(WinPort, self).additional_drt_flag()
         flags += ['--enable-direct-write']
         if not self.get_option('disable_breakpad'):
             flags += ['--enable-crash-reporter', '--crash-dumps-dir=%s' % self._dump_reader.crash_dumps_directory()]
         return flags
 
     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
             # line arguments in the shebang line exactly.
             if _winreg:
                 res = self._check_reg(r'.cgi\Shell\ExecCGI\Command') and res
                 res = self._check_reg(r'.pl\Shell\ExecCGI\Command') and res
             else:
                 _log.warning("Could not check the registry; http may not work correctly.")
 
@@ skipping 53 matching lines @@
         # FIXME: lighttpd depends on some environment variable we're not whitelisting.
         # We should add the variable to an explicit whitelist in base.Port.
         # FIXME: This is a temporary hack to get the cr-win bot online until
         # someone from the cr-win port can take a look.
         use_apache = self.get_option('use_apache')
         apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP']
         for key, value in os.environ.items():
             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
         # python executable to run cgi program.
         env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin", "bin")
         if self.get_option('register_cygwin'):
             setup_mount = self.path_from_chromium_base("third_party", "cygwin", "setup_mount.bat")
             self._executive.run_command([setup_mount])  # Paths are all absolute, so this does not require a cwd.
         return env
 
@@ skipping 16 matching lines @@
         return result
 
     def operating_system(self):
         return 'win'
 
     def relative_test_filename(self, filename):
         path = filename[len(self.layout_tests_dir()) + 1:]
         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')
 
     def path_to_apache_config_file(self):
         return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'win-httpd.conf')
 
     def _lighttpd_path(self, *comps):
         return self.path_from_chromium_base('third_party', 'lighttpd', 'win', *comps)
 
@@ skipping 35 matching lines @@
         return result
 
     def look_for_new_crash_logs(self, crashed_processes, start_time):
         if self.get_option('disable_breakpad'):
             return None
         return self._dump_reader.look_for_new_crash_logs(crashed_processes, start_time)
 
     def clobber_old_port_specific_results(self):
         if not self.get_option('disable_breakpad'):
             self._dump_reader.clobber_old_results()