Fix unittests

LayoutTests/NeverFixTests

 # This file should only include tests that we never intend to fix.
 # There should only be 4 categories of tests here:
 #   1. Test harness tests.
 #   2. Tests enabled by chromium embedders (e.g. Opera).
 #   3. Tests that apply to some platforms but not others.
 #   4. Tests that are too slow in Debug and so we only want to skip them in Debug.
 
 # FIXME: Remove the WontFix keyword and have that be implied. That way, people won't abuse
 # WontFix outside of this file.
 
@@ skipping 22 matching lines @@
 # This test only applies to overlay scrollbar platforms.
 [ SnowLeopard Win Linux ] fast/dom/partial-layout-overlay-scrollbars.html [ WontFix ]
 
 # <progress> on Mac is always animated. So it's hard to get a reliable pixel result.
 [ Mac ] fast/dom/HTMLProgressElement/progress-element.html [ WontFix ]
 
 # These test rubber band overhang drawing, which is a Mac OS X Lion feature
 # that is not supported on other platforms.
 [ Win Linux ] rubberbanding [ WontFix ]
 [ Win Linux ] compositing/rubberbanding [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/rubberbanding [ WontFix ]
+[ Win Linux ] virtual/software/compositing/rubberbanding [ WontFix ]
 
 # This requires usp10.dll version 1.600 or greater on Windows and
 # it isn't installed on XP by default.
 [ XP ] css3/font-feature-settings-rendering.html [ WontFix ]
 
 # These test the CoreAnimation plugin model which we never intend to support on
 # Windows and Linux.
 [ Win Linux ] compositing/plugins/1x1-composited-plugin.html [ WontFix ]
 [ Win Linux ] compositing/plugins/composited-plugin.html [ WontFix ]
 [ Win Linux ] compositing/plugins/large-to-small-composited-plugin.html [ WontFix ]
 [ Win Linux ] compositing/plugins/small-to-large-composited-plugin.html [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/plugins/1x1-composited-plugin.html [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/plugins/composited-plugin.html [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/plugins/large-to-small-composited-plugin.html [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/plugins/small-to-large-composited-plugin.html [ WontFix ]
+[ Win Linux ] virtual/software/compositing/plugins/1x1-composited-plugin.html [ WontFix ]
+[ Win Linux ] virtual/software/compositing/plugins/composited-plugin.html [ WontFix ]
+[ Win Linux ] virtual/software/compositing/plugins/large-to-small-composited-plugin.html [ WontFix ]
+[ Win Linux ] virtual/software/compositing/plugins/small-to-large-composited-plugin.html [ WontFix ]
 
 # Mac's popup behavior is different.
 [ Mac ] fast/forms/select/menulist-onchange-fired-with-key-up-down.html [ WontFix ]
 
 # Chromium does not support PDF content in <img> tags.
 [ Win Linux ] compositing/images/direct-pdf-image.html [ WontFix ]
-[ Win Linux ] virtual/softwarecompositing/images/direct-pdf-image.html [ WontFix ]
+[ Win Linux ] virtual/software/compositing/images/direct-pdf-image.html [ WontFix ]
 
 # Pan-scroll tests are Windows-specific.
 [ Linux Mac ] fast/events/panScroll-click.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-click-hyperlink.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-drag.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-event-fired.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-in-iframe.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-nested-divs.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-panIcon.html [ WontFix ]
 [ Linux Mac ] fast/events/panScroll-nested-divs-forbidden.html [ WontFix ]
 
 # These tests are specific to Windows and Linux.
 [ Mac ] fast/forms/calendar-picker/date-open-picker-with-f4-key.html [ WontFix ]
 [ Mac ] fast/forms/calendar-picker/datetimelocal-open-picker-with-f4-key.html [ WontFix ]
 [ Mac ] fast/forms/calendar-picker/month-open-picker-with-f4-key.html [ WontFix ]
 [ Mac ] fast/forms/calendar-picker/week-open-picker-with-f4-key.html [ WontFix ]
 
 # These tests are specific to Linux.
 [ Mac Win ] compositing/gestures [ WontFix ]
 [ Mac Win ] editing/selection/linux_selection_color.html [ WontFix ]
 [ Mac Win ] fast/text/chromium-linux-fontconfig-renderstyle.html [ WontFix ]
 [ Mac Win ] fast/text/chromium-linux-text-subpixel-positioning.html [ WontFix ]
 [ Mac Win ] fast/text/international/arabic-vertical-offset.html [ WontFix ]
 [ Mac Win ] fast/text/international/complex-joining-using-gpos.html [ WontFix ]
 [ Mac Win ] fast/text/international/draw-complex-text-from-to.html [ WontFix ]
 [ Mac Win ] svg/text/text-with-geometric-precision.svg [ WontFix ]
 
 # These tests are not intended to be run in the virtual suite.
-virtual/softwarecompositing/gestures [ WontFix ]
+virtual/software/compositing/gestures [ WontFix ]
 
 # This test crashes occasionally on Windows and we can't seem to repro locally.
 # See comments in crbug.com/239077
 [ Win ] fast/canvas/webgl/index-validation-with-resized-buffer.html [ WontFix ]
 
-# Tests in media/stable are only supposed to be run as virtual test (see virtual/stable/media).
+# Tests in media/stable are only supposed to be run as virtual test (see virtual/stable/media/stable).
 media/stable [ WontFix ]
 
 # Only run fake-Android tests on Linux
 [ Mac Win ] virtual/android [ WontFix ]
 
 # We only run it through the virtual stable test suite.
 webexposed/stableOnly [ WontFix ]