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..3af96366635dcf8a8caaa65867d8c3b17dfc5199 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/win.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/win.py
@@ -203,7 +203,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')