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 185 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()