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

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 8d40843f917cc3d7061645b72474965c248e5208..9392bf9a9b07beff32faeb3ed6b636c19971b7f6 100644
--- a/LayoutTests/TestExpectations
+++ b/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 ]