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

Tools/Scripts/webkitpy/layout_tests/port/base.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 1109 matching lines @@
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
 
     def http_server_supports_ipv6(self):
         # Apache < 2.4 on win32 does not support IPv6, nor does cygwin apache.
-        if self.host.platform.is_cygwin() or self.get_option('use_apache') and self.host.platform.is_win():
+        if self.host.platform.is_cygwin() or (self.uses_apache() and self.host.platform.is_win()):
             return False
         return True
 
     def stop_helper(self):
         """Shut down the test helper if it is running. Do nothing if
         it isn't, or it isn't available. If a port overrides start_helper()
         it must override this routine as well."""
         if self._helper:
             _log.debug("Stopping layout test helper")
             try:
@@ skipping 667 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)