Merge virtual mac-antialiasedtext and windows-directwrite test suites

LayoutTests/TestExpectations

 # This directly has manual tests that don't have to run with run-webkit-tests
 crbug.com/359838 http/tests/ManualTests/ [ Skip ]
 
 crbug.com/258949 fast/filesystem/workers/file-writer-truncate-extend.html [ Failure Pass ]
 
 crbug.com/307782 [ Win ] http/tests/cache/stopped-revalidation.html [ Pass Timeout ]
 crbug.com/316146 [ XP ] http/tests/cache/cached-main-resource.html [ Pass Timeout ]
 
 # Transient - XHR mixed content type revert will be restored.
 crbug.com/305303 http/tests/security/mixedContent/insecure-sync-post-xhr-allowed.html [ Failure Pass ]
@@ skipping 359 matching lines @@
 # Printing Layout broken in these tests.
 crbug.com/377696 printing/setPrinting.html [ Skip ]
 crbug.com/377696 printing/width-overflow.html [ Skip ]
 
 # Subtle text differences with DirectWrite
 crbug.com/378610 [ Win7 ] fast/css/text-overflow-ellipsis-button.html [ ImageOnlyFailure ]
 
 # Flaky since DirectWrite.
 crbug.com/378610 [ Win ] fast/text/decorations-transformed.html [ Pass Failure ]
 
-# FIXME: Remove windows-directwrite test suite once we're sure the DW won't be reverted. Keep it but skip it for now.
-crbug.com/378610 [ Win7 ] virtual/windows-directwrite [ Skip ]
-
 # Broken tests with hard coded values that only work on one platform, lots of FAIL lines in expectations.
 crbug.com/378610 [ Win7 ] fast/dom/Element/getClientRects.html  [ Failure ]
 crbug.com/378610 [ Win7 ] fast/dom/Range/getClientRects.html [ Failure ]
 
 # Reftests that needs investigation.
 crbug.com/378610 [ Win7 ] compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-late-noncomposite.html [ ImageOnlyFailure ]
 crbug.com/378610 [ Win7 ] compositing/gestures/gesture-tapHighlight-1-iframe-scrolled.html [ ImageOnlyFailure ]
 crbug.com/378610 [ Win7 ] compositing/gestures/gesture-tapHighlight-1-iframe.html [ ImageOnlyFailure ]
 crbug.com/378610 [ Win7 ] compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-composite.html [ ImageOnlyFailure ]
 crbug.com/378610 [ Win7 ] compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-noncomposite.html [ ImageOnlyFailure ]
@@ skipping 38 matching lines @@
 crbug.com/378610 [ Win7 ] fast/text/multiglyph-characters.html [ Failure ]
 
 # Image tests that needs investigation or test changes.
 crbug.com/378610 [ Win7 ] fast/text/selection-rect-rounding.html [ Failure ]
 
 Bug(eae) virtual/gpu/compositedscrolling/overflow/overflow-positioning.html [ NeedsManualRebaseline ]
 
 crbug.com/371725 http/tests/webfont/slow-loading.html [ Pass ImageOnlyFailure Timeout ]
 
 # Issues on the mac-antialiased fonts virtual test suite.
-# crbug.com/367074 [ Mac ] virtual/mac-antialiasedtext/fast/text/sub-pixel/text-scaling-pixel.html [ Skip ]
-crbug.com/334269 [ Mac ] virtual/mac-antialiasedtext/fast/text/font-variant-ligatures.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/mac-antialiasedtext/fast/text/international/zerowidthjoiner.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/mac-antialiasedtext/fast/text/international/bdo-bidi-width.html [ ImageOnlyFailure ]
-crbug.com/348911 [ Mac ] virtual/mac-antialiasedtext/fast/text/international/rtl-space-in-ltr-element.html [ ImageOnlyFailure ]
-crbug.com/367078 [ Mac ] virtual/mac-antialiasedtext/fast/text/international/text-overflow-ellipsis-bidi.html [ ImageOnlyFailure ]
-crbug.com/367078 [ Mac ] virtual/mac-antialiasedtext/fast/text/international/inline-block-with-mixed-direction-words.html  [ ImageOnlyFailure ]
-crbug.com/290411 [ Mac ] virtual/mac-antialiasedtext/fast/text/sub-pixel/text-scaling-pixel.html [ Skip ]
+# crbug.com/367074 [ Mac ] virtual/antialiasedtext/fast/text/sub-pixel/text-scaling-pixel.html [ Skip ]
+crbug.com/334269 [ Mac ] virtual/antialiasedtext/fast/text/font-variant-ligatures.html [ ImageOnlyFailure ]
+crbug.com/334269 [ Mac ] virtual/antialiasedtext/fast/text/international/zerowidthjoiner.html [ ImageOnlyFailure ]
+crbug.com/334269 [ Mac ] virtual/antialiasedtext/fast/text/international/bdo-bidi-width.html [ ImageOnlyFailure ]
+crbug.com/348911 [ Mac ] virtual/antialiasedtext/fast/text/international/rtl-space-in-ltr-element.html [ ImageOnlyFailure ]
+crbug.com/367078 [ Mac ] virtual/antialiasedtext/fast/text/international/text-overflow-ellipsis-bidi.html [ ImageOnlyFailure ]
+crbug.com/367078 [ Mac ] virtual/antialiasedtext/fast/text/international/inline-block-with-mixed-direction-words.html  [ ImageOnlyFailure ]
+crbug.com/290411 [ Mac ] virtual/antialiasedtext/fast/text/sub-pixel/text-scaling-pixel.html [ Skip ]
 
 crbug.com/334269 [ Mac ] fast/text/international/bdo-bidi-width.html [ ImageOnlyFailure ]
 crbug.com/334269 [ Mac ] fast/text/font-variant-ligatures.html [ ImageOnlyFailure ]
 
 # Failing on Mac since r168339
 crbug.com/348911 [ Mac ] fast/text/international/rtl-space-in-ltr-element.html [ ImageOnlyFailure ]
 
 # Switching to content shell failures
 crbug.com/231866 [ Lion ] fast/backgrounds/animated-gif-as-background.html [ Pass ImageOnlyFailure ]
 crbug.com/243599 [ Debug ] http/tests/plugins/interrupted-get-url.html [ Crash Pass ]
@@ skipping 589 matching lines @@
 
 crbug.com/376194 inspector/console/console-format-es6.html [ Skip ]
 crbug.com/376194 inspector/console/console-format-es6-symbols-error.html [ Skip ]
 
 # Temporarily skipped until Chromium side change lands.
 crbug.com/308768 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html [ Skip ]
 crbug.com/308768 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html [ Skip ]
 crbug.com/308768 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag.html [ Skip ]
 crbug.com/308768 http/tests/xmlhttprequest/xmlhttprequest-data-url.html [ Skip ]
 crbug.com/308768 inspector/network/network-status-non-http.html [ Skip ]