Fix unittests

LayoutTests/NeverFixTests

Index: LayoutTests/NeverFixTests
diff --git a/LayoutTests/NeverFixTests b/LayoutTests/NeverFixTests
index 42f162a3c466401b94195a750b39f7ae5cd2198f..f0e028f1e840bd3225d3f745e60b1ea9c615092e 100644
--- a/LayoutTests/NeverFixTests
+++ b/LayoutTests/NeverFixTests
@@ -40,7 +40,7 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
 # 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.
@@ -52,17 +52,17 @@ fast/harness/sample-fail-mismatch-reftest.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 ]
@@ -91,13 +91,13 @@ fast/harness/sample-fail-mismatch-reftest.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