Fix unittests

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 2d9b82d323f4b9ce5d356b643ee2fc6667961f02..d5650ce38e9b5e63f05dd8a428994e64264c3210 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -304,7 +304,7 @@ webkit.org/b/92287 fast/canvas/webgl/context-creation-and-destruction.html [ Fai
 webkit.org/b/92287 virtual/gpu/fast/canvas/webgl/context-creation-and-destruction.html [ Failure ]
 
 # WebGL not yet supported by the software compositor.
-crbug.com/151713 virtual/softwarecompositing/draws-content/webgl-simple-background.html [ ImageOnlyFailure ]
+crbug.com/151713 virtual/software/compositing/draws-content/webgl-simple-background.html [ ImageOnlyFailure ]
 
 # Clipping differences between Chromium platforms. Needs investigation.
 webkit.org/b/98599 [ Linux Win ] css3/masking/clip-path-reference-userSpaceOnUse.html [ ImageOnlyFailure ]
@@ -560,7 +560,7 @@ webkit.org/b/87652 http/tests/appcache/load-from-appcache-defer-resume-crash.htm
 
 webkit.org/b/88939 fast/events/before-unload-adopt-subframe-to-outside.html [ Failure Pass ]
 
-webkit.org/b/89702 virtual/softwarecompositing/scaling/tiled-layer-recursion.html [ ImageOnlyFailure Pass ]
+webkit.org/b/89702 virtual/software/compositing/scaling/tiled-layer-recursion.html [ ImageOnlyFailure Pass ]
 
 # webkitIsFullScreen does not have the correct value after an iframe exits fullscreen
 webkit.org/b/90704 fullscreen/exit-full-screen-iframe.html [ Failure Pass ]
@@ -586,10 +586,10 @@ webkit.org/b/94003 [ Win ] fast/css/word-spacing-characters-complex-text.html [
 webkit.org/b/94017 [ Win ] css2.1/20110323/c541-word-sp-000.htm [ ImageOnlyFailure ]
 
 crbug.com/240374 compositing/overlap-blending/reflection-opacity-huge.html [ ImageOnlyFailure ]
-crbug.com/240374 virtual/softwarecompositing/overlap-blending/reflection-opacity-huge.html [ ImageOnlyFailure ]
+crbug.com/240374 virtual/software/compositing/overlap-blending/reflection-opacity-huge.html [ ImageOnlyFailure ]
 crbug.com/240374 compositing/overlap-blending/children-opacity-huge.html [ ImageOnlyFailure ]
 crbug.com/240374 compositing/overlap-blending/children-opacity-no-overlap.html [ ImageOnlyFailure ]
-crbug.com/240374 virtual/softwarecompositing/overlap-blending/preserves3d-opacity.html [ ImageOnlyFailure ]
+crbug.com/240374 virtual/software/compositing/overlap-blending/preserves3d-opacity.html [ ImageOnlyFailure ]
 
 # Failing due to sub-pixel layout.
 webkit.org/b/95136 fast/css/sticky/sticky-left-percentage.html [ ImageOnlyFailure ]
@@ -674,14 +674,14 @@ crbug.com/239549 inspector-protocol/heap-profiler/heap-snapshot-with-detached-do
 crbug.com/225184 fast/repaint/relayout-fixed-position-after-scale.html [ ImageOnlyFailure ]
 
 # Pixel tests for RTL iframe scrollbar is erroneous. Cannot observe on actual browser.
-crbug.com/227473 [ Debug ] virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow-scrolled.html [ Failure Pass ]
+crbug.com/227473 [ Debug ] virtual/software/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html [ Failure Pass ]
 crbug.com/227473 [ Debug ] compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html [ Failure Pass ]
 crbug.com/192172 [ Debug ] compositing/rtl/rtl-iframe-absolute-overflow.html [ Failure Pass ]
-crbug.com/192172 [ Debug ] virtual/softwarecompositing/rtl/rtl-iframe-absolute-overflow.html [ Failure Pass ]
+crbug.com/192172 [ Debug ] virtual/software/compositing/rtl/rtl-iframe-absolute-overflow.html [ Failure Pass ]
 crbug.com/192172 [ Debug ] compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html [ Failure Pass ]
-crbug.com/192172 [ Debug ] virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow-scrolled.html [ Failure Pass ]
+crbug.com/192172 [ Debug ] virtual/software/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html [ Failure Pass ]
 crbug.com/192172 [ Debug ] compositing/rtl/rtl-iframe-fixed-overflow.html [ Failure Pass ]
-crbug.com/192172 [ Debug ] virtual/softwarecompositing/rtl/rtl-iframe-fixed-overflow.html [ Failure Pass ]
+crbug.com/192172 [ Debug ] virtual/software/compositing/rtl/rtl-iframe-fixed-overflow.html [ Failure Pass ]
 
 webkit.org/b/112621 [ Win Linux ] fast/forms/datalist/update-range-with-datalist.html [ ImageOnlyFailure Pass ]
 webkit.org/b/112629 http/tests/xmlhttprequest/send-array-buffer.html [ Failure Pass ]
@@ -727,7 +727,7 @@ crbug.com/234069 [ Mac Release ] fast/events/touch/gesture/long-press-drag-drop-
 
 crbug.com/227397 svg/animations/animateMotion-additive-1.svg [ ImageOnlyFailure ]
 
-crbug.com/234758 [ Lion ] virtual/softwarecompositing/scrollbars/custom-composited-different-track-parts.html [ ImageOnlyFailure Pass ]
+crbug.com/234758 [ Lion ] virtual/software/compositing/scrollbars/custom-composited-different-track-parts.html [ ImageOnlyFailure Pass ]
 
 # Gets a "Maximum call stack size exceeded" exception in debug that doesn't happen in release.
 crbug.com/14885 [ Mac Debug ] fast/js/JSON-stringify.html [ Failure ]
@@ -747,7 +747,7 @@ crbug.com/88588 [ Debug ] fast/lists/inlineBoxWrapperNullCheck.html [ Failure Pa
 crbug.com/252344 http/tests/history/redirect-js-document-location-0-seconds.html [ Failure Pass ]
 
 crbug.com/231357 [ SnowLeopard Lion Win Linux Debug ] compositing/video-page-visibility.html [ ImageOnlyFailure ]
-crbug.com/231357 [ Win Linux Debug ] virtual/softwarecompositing/video-page-visibility.html [ ImageOnlyFailure ]
+crbug.com/231357 [ Win Linux Debug ] virtual/software/compositing/video-page-visibility.html [ ImageOnlyFailure ]
 
 crbug.com/249580 svg/text/font-size-below-point-five.svg [ Failure ImageOnlyFailure Pass ]
 
@@ -843,7 +843,7 @@ crbug.com/231866 [ Lion ] fast/backgrounds/animated-gif-as-background.html [ Pas
 crbug.com/231880 fast/dom/Window/open-window-min-size.html [ Failure Pass ]
 crbug.com/235449 fast/loader/stateobjects/state-attribute-history-getter.html [ Failure Pass ]
 crbug.com/235448 fast/loader/stateobjects/popstate-fires-on-history-traversal.html [ Failure Pass ]
-crbug.com/235110 [ Mac ] virtual/softwarecompositing [ Skip ]
+crbug.com/235110 [ Mac ] virtual/software/compositing [ Skip ]
 crbug.com/243248 [ Mac Win ] fast/events/attempt-scroll-with-no-scrollbars.html [ Failure Pass ]
 crbug.com/243291 [ Debug ] css3/filters/custom/custom-filter-nonseparable-blend-mode-color.html [ Crash ]
 crbug.com/243291 [ Debug ] css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html [ Crash ]
@@ -905,8 +905,8 @@ crbug.com/247889 [ Win ] http/tests/navigation/back-send-referrer.html [ Pass Ti
 crbug.com/247979 [ Win Mac Release ] inspector/elements/edit-dom-actions.html [ Failure Pass ]
 crbug.com/247979 [ Win7 Debug ] inspector/elements/edit-dom-actions.html [ Timeout ]
 crbug.com/247979 [ Mac Linux Debug ] inspector/elements/edit-dom-actions.html [ Pass Timeout ]
-crbug.com/247982 [ Linux Mac Debug ] virtual/gpu/compositedscrolling/overflow/overflow-positioning.html [ ImageOnlyFailure Pass ]
-crbug.com/247982 [ Win ] virtual/gpu/compositedscrolling/overflow/overflow-positioning.html [ ImageOnlyFailure Pass ]
+crbug.com/247982 [ Linux Mac Debug ] virtual/gpucompositedscrolling/overflow/overflow-positioning.html [ ImageOnlyFailure Pass ]
+crbug.com/247982 [ Win ] virtual/gpucompositedscrolling/overflow/overflow-positioning.html [ ImageOnlyFailure Pass ]
 crbug.com/248063 plugins/plugin-clip-subframe.html [ Pass Failure ]
 crbug.com/248065 [ Linux ] svg/text/foreignObject-text-clipping-bug.xml [ Pass ImageOnlyFailure ]
 crbug.com/248067 fast/workers/shared-worker-storagequota-query-usage.html [ Pass Failure ]
@@ -1042,9 +1042,9 @@ crbug.com/293932 [ Android ] css3/images/optimize-contrast-image.html [ ImageOnl
 crbug.com/293932 [ Android ] svg/as-background-image/svg-width-100p-as-background.html [ ImageOnlyFailure ]
 
 # Needs triaging.
-crbug.com/289883 [ Android ] virtual/softwarecompositing/overflow/get-transform-from-non-box-container.html [ Timeout ]
-crbug.com/289883 [ Android ] virtual/softwarecompositing/tiling/crash-huge-layer.html [ Timeout ]
-crbug.com/289883 [ Android ] virtual/softwarecompositing/tiling/preserve3d-tiled.html [ Timeout ]
+crbug.com/289883 [ Android ] virtual/software/compositing/overflow/get-transform-from-non-box-container.html [ Timeout ]
+crbug.com/289883 [ Android ] virtual/software/compositing/tiling/crash-huge-layer.html [ Timeout ]
+crbug.com/289883 [ Android ] virtual/software/compositing/tiling/preserve3d-tiled.html [ Timeout ]
 crbug.com/289883 [ Android ] compositing/layer-creation/fixed-position-out-of-view.html [ Failure ]
 crbug.com/289883 [ Android ] compositing/repaint/invalidations-on-composited-layers.html [ Failure ]
 crbug.com/289883 [ Android ] svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults.xhtml [ Failure ]
@@ -1120,7 +1120,7 @@ crbug.com/298188 [ Linux Win ] virtual/implsidepainting/inspector/timeline/timel
 crbug.com/267888 [ Android ] crypto [ Skip ]
 
 crbug.com/298039 [ Mac ] compositing/overflow/clear-scroll-parent.html [ Failure ]
-crbug.com/298039 [ Mac ] virtual/gpu/compositedscrolling/overflow/clear-scroll-parent.html [ Failure ]
+crbug.com/298039 [ Mac ] virtual/gpucompositedscrolling/overflow/clear-scroll-parent.html [ Failure ]
 
 crbug.com/304952 fast/forms/placeholder-position.html [ ImageOnlyFailure Pass ]