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

This switches the default on Win 7 to use the native Win32 version of Apache
2.2 instead of LigHTTPd.  In theory Apache will substantially more stable
and also probably faster. I am hoping that this fixes the situation in bug
378444 where the server just doesn't work on some runs as well.

We also match more of the test expectations on other platforms.

If this change sticks and does improve flakiness, we'll try switching XP
as well in a later change.

This change also deletes all of the FlakyTest entries for http tests
on Win7, so that we can better get a real sense of the flakiness.

R=ojan@chromium.org
BUG=378444, 30536

Review URL: https://codereview.chromium.org/327423008

git-svn-id: svn://svn.chromium.org/blink/trunk@177046 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/TestExpectations

@@ -1064,3 +1064,39 @@ crbug.com/374378 [ Debug ] virtual/gpu/fast/canvas/webgl/WebGLContextEvent.html
 crbug.com/328961 inspector/profiler/canvas2d/canvas2d-api-changes.html [ Failure ]
 
 crbug.com/389047 screen_orientation/page-visibility.html [ Pass Failure ]
+
+# switching to apache-win32: needs triaging.
+crbug.com/30536 [ Win7 ] http/tests/css/missing-repaint-after-slow-style-sheet.pl [ ImageOnlyFailure ]
+crbug.com/30536 [ Win7 ] http/tests/images/drag-image-to-desktop.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/inspector/network/long-script-content.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/inspector/network/network-timing.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/inspector/resource-parameters.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/local/blob/send-data-blob.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/local/blob/send-hybrid-blob.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/security/XFrameOptions/x-frame-options-cached.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/cached-frame-csp.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/security/xssAuditor/cached-frame.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/security/xssAuditor/chunked-big-script.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/22.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/27.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/28.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/29.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/30.html [ Failure ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-exact-matching/36.html [ Failure ]
+
+# switching to apache-win32 flakiness that needs triaging.
+crbug.com/30536 [ Win7 ] http/tests/navigation/forward-and-cancel.html [ Timeout Pass ] 
+crbug.com/30536 [ Win7 ] http/tests/navigation/ping-cookie.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/navigation/ping-same-origin.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/report-uri-from-child-frame.html [ Failure Pass Timeout ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/report-blocked-file-uri.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/report-uri-scheme-relative.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/xssAuditor/report-script-tag-full-block.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/xssAuditor/report-script-tag-replace-state.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/xssAuditor/report-script-tag.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/access-control-and-redirects-async-same-origin.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html [ Failure Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/clipboard/clipboard-file-access.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/report-uri.html [ Timeout Pass ]
+crbug.com/30536 [ Win7 ] http/tests/security/contentSecurityPolicy/report-only.html [ Failure Pass ]

third_party/WebKit/LayoutTests/http/conf/win-httpd.conf

@@ -3,21 +3,17 @@ KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 15
 
+LoadModule alias_module modules/mod_alias.so
+LoadModule asis_module modules/mod_asis.so
 LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule include_module modules/mod_include.so
-LoadModule log_config_module modules/mod_log_config.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgi_module modules/mod_cgi.so 
 LoadModule headers_module modules/mod_headers.so
-LoadModule ssl_module modules/mod_ssl.so
+LoadModule log_config_module modules/mod_log_config.so
 LoadModule mime_module modules/mod_mime.so
-LoadModule asis_module modules/mod_asis.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule imagemap_module modules/mod_imagemap.so
-LoadModule actions_module modules/mod_actions.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule php5_module modules/php5apache2_2.dll
-LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule ssl_module modules/mod_ssl.so
 
 ServerName 127.0.0.1
 

third_party/WebKit/LayoutTests/platform/win/http/tests/misc/favicon-as-image-expected.txt

@@ -18,11 +18,13 @@ layer at (0,36) size 18x18
       RenderView at (0,0) size 16x16
     layer at (0,0) size 16x16
       RenderBlock {HTML} at (0,0) size 16x16
-        RenderBody {BODY} at (8,8) size 0x0
+        RenderBody {BODY} at (0,0) size 16x16
+          RenderImage {IMG} at (0,0) size 16x16
 layer at (0,54) size 18x18
   RenderPartObject {IFRAME} at (0,18) size 18x18 [bgcolor=#FF0000] [border: (1px solid #000000)]
     layer at (0,0) size 16x16
       RenderView at (0,0) size 16x16
     layer at (0,0) size 16x16
       RenderBlock {HTML} at (0,0) size 16x16
-        RenderBody {BODY} at (8,8) size 0x0
+        RenderBody {BODY} at (0,0) size 16x16
+          RenderImage {IMG} at (0,0) size 16x16

third_party/WebKit/LayoutTests/platform/win/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt

-Test that setRequestHeader can be used to set headers that have a name, but no value.
-
-HTTP_REFERER: http://127.0.0.1:8000/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html
-HTTP_ACCEPT_ENCODING: gzip,deflate
-HTTP_CONNECTION: keep-alive
-HTTP_ACCEPT: */*
-HTTP_USER_AGENT: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/19.77.34.5 Safari/537.36
-HTTP_ACCEPT_LANGUAGE: en-us,en
-HTTP_HOST: 127.0.0.1:8000
-

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -1127,7 +1127,7 @@ class Port(object):
 
     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
 

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py

@@ -328,7 +328,7 @@ class PortTest(unittest.TestCase):
         port.host.platform.os_name = 'cygwin'
         self.assertFalse(port.http_server_supports_ipv6())
         port.host.platform.os_name = 'win'
-        self.assertTrue(port.http_server_supports_ipv6())
+        self.assertFalse(port.http_server_supports_ipv6())
 
     def test_check_httpd_success(self):
         port = self.make_port(executive=MockExecutive2())

third_party/WebKit/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')