Update, optimize baselines after flipping Win XP to Apache for webkit tests.

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 46b6f0a7b4c7da30b45d3938296d557728541d52..4d82a7d38e6d570a37ec498a1e86aba5d0bcc899 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -1241,23 +1241,23 @@ crbug.com/384950 fast/forms/submit-change-fragment.html [ Pass Timeout ]
 crbug.com/384566 svg/custom/textPath-change-reference2.svg [ ImageOnlyFailure Pass ]
 
 # 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 [ Win ] http/tests/css/missing-repaint-after-slow-style-sheet.pl [ ImageOnlyFailure ]
+crbug.com/30536 [ Win ] http/tests/images/drag-image-to-desktop.html [ Failure ]
+crbug.com/30536 [ Win ] 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 ]
+crbug.com/30536 [ Win ] http/tests/inspector/resource-parameters.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/local/blob/send-data-blob.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/local/blob/send-hybrid-blob.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/security/XFrameOptions/x-frame-options-cached.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/security/contentSecurityPolicy/cached-frame-csp.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/security/xssAuditor/cached-frame.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/security/xssAuditor/chunked-big-script.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/xmlhttprequest/origin-exact-matching/22.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/xmlhttprequest/origin-exact-matching/27.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/xmlhttprequest/origin-exact-matching/28.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/xmlhttprequest/origin-exact-matching/29.html [ Failure ]
+crbug.com/30536 [ Win ] http/tests/xmlhttprequest/origin-exact-matching/30.html [ Failure ]
+crbug.com/30536 [ Win ] 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 ]