Backed out changeset c68a6b2e0157 (bug 1557371) for causing failures in reftest/content/bugs/272646-1.xul CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Tue, 02 Jul 2019 06:01:31 +0300
changeset 543704 9525f0cc6ca1bae213239c542b7a6642f05c1f8e
parent 543703 405f857977e5589e4e4e8c23146000b0e5cabfd7
child 543705 1a2ce7a5ce7d36f9310031d9a2dbaa60d62e1819
child 543759 a15e5a44b7ed0a285c92839055efd83671b49552
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1557371, 272646
milestone69.0a1
backs outc68a6b2e01576b844a9b0637b73a501345bb5fef
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset c68a6b2e0157 (bug 1557371) for causing failures in reftest/content/bugs/272646-1.xul CLOSED TREE
editor/reftests/xul/reftest.list
layout/reftests/bidi/reftest.list
layout/reftests/box-ordinal/reftest.list
layout/reftests/box-shadow/reftest.list
layout/reftests/bugs/reftest.list
layout/reftests/css-display/reftest.list
layout/reftests/forms/input/file/reftest.list
layout/reftests/forms/input/text/reftest.list
layout/reftests/forms/placeholder/reftest.list
layout/reftests/forms/textbox/reftest.list
layout/reftests/image-region/reftest.list
layout/reftests/invalidation/reftest.list
layout/reftests/native-theme/reftest.list
layout/reftests/reftest-sanity/reftest.list
layout/reftests/text-shadow/reftest.list
layout/reftests/xul-document-load/reftest.list
layout/reftests/xul/reftest.list
layout/tools/reftest/jar.mn
layout/xul/grid/reftests/reftest.list
layout/xul/reftest/reftest.list
toolkit/content/tests/reftests/reftest.list
--- a/editor/reftests/xul/reftest.list
+++ b/editor/reftests/xul/reftest.list
@@ -1,17 +1,17 @@
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/empty-1.xul chrome://reftest/content/editor/reftests/xul/empty-ref.xul # Windows: bug 1239170
-!= chrome://reftest/content/editor/reftests/xul/empty-2.xul chrome://reftest/content/editor/reftests/xul/empty-ref.xul
+fails-if(Android) skip-if(winWidget) == empty-1.xul empty-ref.xul # Windows: bug 1239170
+!= empty-2.xul empty-ref.xul
 # There is no way to simulate an autocomplete textbox in windows XP/Vista/7/8/10 default theme using CSS.
 # Therefore, the equlity tests below should be marked as failing.
-fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == chrome://reftest/content/editor/reftests/xul/autocomplete-1.xul chrome://reftest/content/editor/reftests/xul/autocomplete-ref.xul # bug 783658
-fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == chrome://reftest/content/editor/reftests/xul/emptyautocomplete-1.xul chrome://reftest/content/editor/reftests/xul/emptyautocomplete-ref.xul # bug 783658
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/emptytextbox-1.xul chrome://reftest/content/editor/reftests/xul/emptytextbox-ref.xul # Windows: bug 1239170
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/emptytextbox-2.xul chrome://reftest/content/editor/reftests/xul/emptytextbox-ref.xul # Windows: bug 1239170
-!= chrome://reftest/content/editor/reftests/xul/emptytextbox-4.xul chrome://reftest/content/editor/reftests/xul/emptytextbox-ref.xul
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/passwd-1.xul chrome://reftest/content/editor/reftests/xul/passwd-ref.xul # Windows: bug 1239170
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/passwd-2.xul chrome://reftest/content/editor/reftests/xul/passwd-ref.xul # Windows: bug 1239170
-!= chrome://reftest/content/editor/reftests/xul/passwd-3.xul chrome://reftest/content/editor/reftests/xul/passwd-ref.xul
-fails-if(Android) == chrome://reftest/content/editor/reftests/xul/plain-1.xul chrome://reftest/content/editor/reftests/xul/plain-ref.xul # bug 783658
-fails-if(Android) skip-if(winWidget) == chrome://reftest/content/editor/reftests/xul/textbox-1.xul chrome://reftest/content/editor/reftests/xul/textbox-ref.xul # Windows: bug 1239170
-!= chrome://reftest/content/editor/reftests/xul/textbox-disabled.xul chrome://reftest/content/editor/reftests/xul/textbox-ref.xul
+fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == autocomplete-1.xul autocomplete-ref.xul # bug 783658
+fails-if(Android) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) == emptyautocomplete-1.xul emptyautocomplete-ref.xul # bug 783658
+fails-if(Android) skip-if(winWidget) == emptytextbox-1.xul emptytextbox-ref.xul # Windows: bug 1239170
+fails-if(Android) skip-if(winWidget) == emptytextbox-2.xul emptytextbox-ref.xul # Windows: bug 1239170
+!= emptytextbox-4.xul emptytextbox-ref.xul
+fails-if(Android) skip-if(winWidget) == passwd-1.xul passwd-ref.xul # Windows: bug 1239170
+fails-if(Android) skip-if(winWidget) == passwd-2.xul passwd-ref.xul # Windows: bug 1239170
+!= passwd-3.xul passwd-ref.xul
+fails-if(Android) == plain-1.xul plain-ref.xul # bug 783658
+fails-if(Android) skip-if(winWidget) == textbox-1.xul textbox-ref.xul # Windows: bug 1239170
+!= textbox-disabled.xul textbox-ref.xul
 # Read-only textboxes look like normal textboxes in windows Vista/7 default theme
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(6\.[012]|10\.0)/.test(http.oscpu)) skip-if(winWidget) != chrome://reftest/content/editor/reftests/xul/textbox-readonly.xul chrome://reftest/content/editor/reftests/xul/textbox-ref.xul # Windows: bug 1239170
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(6\.[012]|10\.0)/.test(http.oscpu)) skip-if(winWidget) != textbox-readonly.xul textbox-ref.xul # Windows: bug 1239170
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -138,24 +138,24 @@ random-if(/^Windows\x20NT\x206\.1/.test(
 == 746987-4.html 746987-4-ref.html
 == 779003-1.html 779003-1-ref.html
 == 779003-1-dynamic.html 779003-1-ref.html
 == 817406-1.html 817406-1-ref.html
 == 817406-2.html 817406-2-ref.html
 == 817406-3.html 817406-1-ref.html
 == 817406-4.html 817406-4-ref.html
 == 847242-1.html 847242-1-ref.html
-pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xul chrome://reftest/content/bidi/869833-1-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == 869833-1.xul 869833-1-ref.xul
 == 922530-1.html 922530-1-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 922550-1.html 922550-1-ref.html # Bug 1392106
 == 989994-1.html 989994-1-ref.html
 == 1067268-1.html 1067268-1-ref.html
 == 1069941-inline-bidi-border-1.html 1069941-inline-bidi-border-1-ref.html
 == 1069941-inline-bidi-margin-1.html 1069941-inline-bidi-margin-1-ref.html
-!= chrome://reftest/content/bidi/1155359-1.xul chrome://reftest/content/bidi/1155359-1-ref.xul
+!= 1155359-1.xul 1155359-1-ref.xul
 == 1157726-1.html 1157726-1-ref.html
 == 1161752.html 1161752-ref.html
 == 1161752-5-embed.html 1161752-5-embed-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-1a-ltr.html brackets-1a-ltr-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-1a-rtl.html brackets-1a-rtl-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-1b-ltr.html brackets-1b-ltr-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-1b-rtl.html brackets-1b-rtl-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-1c-ltr.html brackets-1c-ltr-ref.html # Bug 1392106
--- a/layout/reftests/box-ordinal/reftest.list
+++ b/layout/reftests/box-ordinal/reftest.list
@@ -1,7 +1,7 @@
 pref(layout.css.xul-box-display-values.content.enabled,true) == box-ordinal-with-out-of-flow-1.html box-ordinal-with-out-of-flow-1-ref.html
-== chrome://reftest/content/box-ordinal/dynamic-1-remove-to-none-grouped.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul
-== chrome://reftest/content/box-ordinal/dynamic-1-add-to-one-grouped.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul
-== chrome://reftest/content/box-ordinal/dynamic-1-remove-to-one-grouped-1.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul
-fails == chrome://reftest/content/box-ordinal/dynamic-1-remove-to-one-grouped-2.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul # bug 575500
-== chrome://reftest/content/box-ordinal/dynamic-1-add-to-two-grouped-1.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul
-== chrome://reftest/content/box-ordinal/dynamic-1-add-to-two-grouped-2.xul chrome://reftest/content/box-ordinal/dynamic-1-ref.xul
+== dynamic-1-remove-to-none-grouped.xul dynamic-1-ref.xul
+== dynamic-1-add-to-one-grouped.xul dynamic-1-ref.xul
+== dynamic-1-remove-to-one-grouped-1.xul dynamic-1-ref.xul
+fails == dynamic-1-remove-to-one-grouped-2.xul dynamic-1-ref.xul # bug 575500
+== dynamic-1-add-to-two-grouped-1.xul dynamic-1-ref.xul
+== dynamic-1-add-to-two-grouped-2.xul dynamic-1-ref.xul
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -13,17 +13,17 @@ random != boxshadow-blur-2.html boxshado
 fails-if(Android) == boxshadow-button.html boxshadow-button-ref.html
 fuzzy-if(OSX==1010,0-1,0-24) fuzzy-if(d2d,0-16,0-999) fuzzy-if(skiaContent,0-1,0-12) fuzzy-if(webrender,5-9,700-1080) == boxshadow-large-border-radius.html boxshadow-large-border-radius-ref.html # Bug 1209649
 
 fails-if(Android) == boxshadow-fileupload.html boxshadow-fileupload-ref.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-98,0-152) fuzzy-if(skiaContent,0-13,0-28) fuzzy-if(webrender,19-19,47-47) == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg
 fuzzy-if(skiaContent,0-1,0-17) random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
 fuzzy-if(skiaContent,0-1,0-17) == boxshadow-mixed-2.html boxshadow-mixed-2-ref.html
 random-if(d2d) fuzzy-if(skiaContent,0-1,0-212) fuzzy-if(webrender,0-127,0-3528) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
-fuzzy-if(skiaContent,0-1,0-50) == chrome://reftest/content/box-shadow/boxshadow-dynamic.xul chrome://reftest/content/box-shadow/boxshadow-dynamic-ref.xul
+fuzzy-if(skiaContent,0-1,0-50) == boxshadow-dynamic.xul boxshadow-dynamic-ref.xul
 random-if(d2d) fuzzy-if(skiaContent,0-1,0-14) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
 random-if(d2d) fuzzy-if(skiaContent,0-1,0-22) == boxshadow-twocorners.html boxshadow-twocorners-ref.html
 random-if(d2d) fuzzy-if(skiaContent,0-1,0-36) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
 fuzzy(0-2,0-440) == boxshadow-skiprect.html boxshadow-skiprect-ref.html
 == boxshadow-opacity.html boxshadow-opacity-ref.html
 == boxshadow-color-rounding.html boxshadow-color-rounding-ref.html
 == boxshadow-color-rounding-middle.html boxshadow-color-rounding-middle-ref.html
 fuzzy(0-3,0-500) fuzzy-if(d2d,0-2,0-1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int-ref.html
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -165,44 +165,44 @@ random == 99850-1b.html 99850-1-ref.html
 == 179596-2.html 179596-2-ref.html
 == 179596-2.html 179596-2-ref2.html
 == 179596-2.html 179596-2-ref3.html
 != 180085-1.html 180085-1-ref.html # fix for 180085 reverted in bug 1010675
 != 180085-2.html 180085-2-ref.html # fix for 180085 reverted in bug 1010675
 == 185388-1.html 185388-1-ref.html
 == 186317-1.html 186317-1-ref.html
 == 192902-1.html 192902-ref.html
-== chrome://reftest/content/bugs/192767-01.xul chrome://reftest/content/bugs/192767-11.xul
-== chrome://reftest/content/bugs/192767-02.xul chrome://reftest/content/bugs/192767-12.xul
-== chrome://reftest/content/bugs/192767-03.xul chrome://reftest/content/bugs/192767-13.xul
-== chrome://reftest/content/bugs/192767-04.xul chrome://reftest/content/bugs/192767-14.xul
-== chrome://reftest/content/bugs/192767-05.xul chrome://reftest/content/bugs/192767-15.xul
-== chrome://reftest/content/bugs/192767-06.xul chrome://reftest/content/bugs/192767-16.xul
-== chrome://reftest/content/bugs/192767-07.xul chrome://reftest/content/bugs/192767-17.xul
-== chrome://reftest/content/bugs/192767-21.xul chrome://reftest/content/bugs/192767-31.xul
-== chrome://reftest/content/bugs/192767-22.xul chrome://reftest/content/bugs/192767-32.xul
-== chrome://reftest/content/bugs/192767-23.xul chrome://reftest/content/bugs/192767-33.xul
-== chrome://reftest/content/bugs/192767-24.xul chrome://reftest/content/bugs/192767-34.xul
-== chrome://reftest/content/bugs/192767-25.xul chrome://reftest/content/bugs/192767-35.xul
-== chrome://reftest/content/bugs/192767-26.xul chrome://reftest/content/bugs/192767-36.xul
-== chrome://reftest/content/bugs/192767-27.xul chrome://reftest/content/bugs/192767-37.xul
-!= chrome://reftest/content/bugs/192767-01.xul chrome://reftest/content/bugs/192767-21.xul
-!= chrome://reftest/content/bugs/192767-02.xul chrome://reftest/content/bugs/192767-22.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-03.xul chrome://reftest/content/bugs/192767-23.xul
-!= chrome://reftest/content/bugs/192767-04.xul chrome://reftest/content/bugs/192767-24.xul
-!= chrome://reftest/content/bugs/192767-05.xul chrome://reftest/content/bugs/192767-25.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-06.xul chrome://reftest/content/bugs/192767-26.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-07.xul chrome://reftest/content/bugs/192767-27.xul
-!= chrome://reftest/content/bugs/192767-11.xul chrome://reftest/content/bugs/192767-31.xul
-!= chrome://reftest/content/bugs/192767-12.xul chrome://reftest/content/bugs/192767-32.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-13.xul chrome://reftest/content/bugs/192767-33.xul
-!= chrome://reftest/content/bugs/192767-14.xul chrome://reftest/content/bugs/192767-34.xul
-!= chrome://reftest/content/bugs/192767-15.xul chrome://reftest/content/bugs/192767-35.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-16.xul chrome://reftest/content/bugs/192767-36.xul
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-17.xul chrome://reftest/content/bugs/192767-37.xul
+== 192767-01.xul 192767-11.xul
+== 192767-02.xul 192767-12.xul
+== 192767-03.xul 192767-13.xul
+== 192767-04.xul 192767-14.xul
+== 192767-05.xul 192767-15.xul
+== 192767-06.xul 192767-16.xul
+== 192767-07.xul 192767-17.xul
+== 192767-21.xul 192767-31.xul
+== 192767-22.xul 192767-32.xul
+== 192767-23.xul 192767-33.xul
+== 192767-24.xul 192767-34.xul
+== 192767-25.xul 192767-35.xul
+== 192767-26.xul 192767-36.xul
+== 192767-27.xul 192767-37.xul
+!= 192767-01.xul 192767-21.xul
+!= 192767-02.xul 192767-22.xul
+fails-if(Android&&!asyncPan) != 192767-03.xul 192767-23.xul
+!= 192767-04.xul 192767-24.xul
+!= 192767-05.xul 192767-25.xul
+fails-if(Android&&!asyncPan) != 192767-06.xul 192767-26.xul
+fails-if(Android&&!asyncPan) != 192767-07.xul 192767-27.xul
+!= 192767-11.xul 192767-31.xul
+!= 192767-12.xul 192767-32.xul
+fails-if(Android&&!asyncPan) != 192767-13.xul 192767-33.xul
+!= 192767-14.xul 192767-34.xul
+!= 192767-15.xul 192767-35.xul
+fails-if(Android&&!asyncPan) != 192767-16.xul 192767-36.xul
+fails-if(Android&&!asyncPan) != 192767-17.xul 192767-37.xul
 != 200774-1.html about:blank
 == 201215-1.html 201215-1-ref.html
 == 201293-1a.html 201293-1-ref.html
 == 201293-1b.html 201293-1-ref.html
 == 201293-1c.html 201293-1-ref.html
 == 201293-1d.html 201293-1-ref.html
 == 203727.html 203727-ref.html
 == 206516-1.html 206516-1-ref.html
@@ -281,37 +281,37 @@ skip-if(Android&&asyncPan) == 243519-1.h
 == 243519-9c.html 243519-9-ref.html
 == 243519-9d.html 243519-9-ref.html
 == 243519-9e.html 243519-9-ref.html
 == 243519-9f.html 243519-9-ref.html
 == 244135-1.html 244135-1-ref.html
 == 244135-2.html 244135-2-ref.html
 == 244932-1.html 244932-1-ref.html
 == 246669-1.html 246669-1-ref.html
-fails-if(Android) == chrome://reftest/content/bugs/249141.xul chrome://reftest/content/bugs/249141-ref.xul # dependent on width of '…' and '*' in the default font
+fails-if(Android) == 249141.xul 249141-ref.xul # dependent on width of '…' and '*' in the default font
 == 249982-1.html 249982-1-ref.html
 == 252920-1.html 252920-1-ref.html
 == 253701-1.html 253701-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 255820-1.html 255820-1-ref.html
 == 260406-1.html 260406-1-ref.html
-== chrome://reftest/content/bugs/261826-1.xul chrome://reftest/content/bugs/261826-1-ref.xul
+== 261826-1.xul 261826-1-ref.xul
 == 262151-1.html 262151-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 262998-1.html 262998-1-ref.html
 == 267353-1.html 267353-1-ref.html
 == 269908-1.html 269908-1-ref.html
 == 269908-2.html 269908-2-ref.html
 == 269908-3.html 269908-3-ref.html
 == 269908-4.html 269908-4-ref.html
 == 269908-5.html 269908-5-ref.html
 == 271747-1a.html 271747-1-ref.html
 == 271747-1b.html 271747-1-ref.html
-== chrome://reftest/content/bugs/272646-1.xul chrome://reftest/content/bugs/272646-1-ref.xul
-== chrome://reftest/content/bugs/272646-2a.xul chrome://reftest/content/bugs/272646-2-ref.xul
-== chrome://reftest/content/bugs/272646-2b.xul chrome://reftest/content/bugs/272646-2-ref.xul
-== chrome://reftest/content/bugs/272646-2c.xul chrome://reftest/content/bugs/272646-2-ref.xul
+== 272646-1.xul 272646-1-ref.xul
+== 272646-2a.xul 272646-2-ref.xul
+== 272646-2b.xul 272646-2-ref.xul
+== 272646-2c.xul 272646-2-ref.xul
 fuzzy-if(Android,0-3,0-50) fuzzy-if(skiaContent,0-1,0-133) == 273681-1.html 273681-1-ref.html
 == 278266-1a.html 278266-1-ref.html
 == 278266-1b.html 278266-1-ref.html
 == 280708-1a.html 280708-1-ref.html
 == 280708-1b.html 280708-1-ref.html
 == 281241-1.html 281241-1-ref.html
 == 281241-2.xhtml 281241-1-ref.html
 == 283686-1.html about:blank
@@ -324,18 +324,18 @@ random-if(d2d) fuzzy-if(Android,0-8,0-14
 == 291078-2.html 291078-2-ref.html
 == 291262-1.html 291262-1-ref.html
 == 294306-1.html 294306-1a-ref.html
 != 294306-1.html 294306-1b-ref.html
 == 296361-1.html 296361-ref.html
 == 296904-1.html 296904-1-ref.html
 == 299136-1.html 299136-1-ref.html
 == 299837-1.html 299837-1-ref.html
-== chrome://reftest/content/bugs/299837-2.xul chrome://reftest/content/bugs/299837-2-ref.xul
-random-if(d2d) == chrome://reftest/content/bugs/299837-3.xul chrome://reftest/content/bugs/299837-3-ref.xul # bug 587631
+== 299837-2.xul 299837-2-ref.xul
+random-if(d2d) == 299837-3.xul 299837-3-ref.xul # bug 587631
 == 300691-1a.html 300691-1-ref.html
 == 300691-1b.html 300691-1-ref.html
 == 300691-1c.html 300691-1-ref.html
 == 300691-1d.html 300691-1-ref.html
 == 300691-1e.html 300691-1-ref.html
 == 300691-1f.html 300691-1-ref.html
 == 301726-1.html 301726-1-ref.html
 fails-if(Android) != 301726-2.html 301726-2-ref.html
@@ -347,17 +347,17 @@ fails-if(Android) != 301726-2.html 30172
 == 307076-1.html 307076-1-ref.html
 == 307102-1.html 307102-1-ref.html
 == 307102-2.html 307102-2-ref.html
 == 307102-3.html 307102-3-ref.html
 == 307102-4.html 307102-4-ref.html
 == 308406-1.html 308406-1-ref.html
 == 308406-2.html 308406-2-ref.html
 == 309550-1.html 309550-1-ref.html
-== chrome://reftest/content/bugs/309914-1.xul chrome://reftest/content/bugs/309914-1-ref.xul
+== 309914-1.xul 309914-1-ref.xul
 == 311366-unknown-inline-1.html 311366-unknown-inline-1-ref.html
 == 311366-unknown-block-1.html 311366-unknown-block-1-ref.html
 == 311366-unknown-block-3.html 311366-unknown-block-3-ref.html
 == 311366-unknown-block-2.html 311366-unknown-block-2-ref.html
 == 311366-unknown-inline-2.html 311366-unknown-inline-2-ref.html
 == 311822-1.html 311822-1-ref-a.html
 == 311822-1.html 311822-1-ref-b.html
 == 315620-1a.html 315620-1-ref.html
@@ -420,20 +420,20 @@ fuzzy-if(Android,0-2,0-18) == 315920-17.
 == 315920-28c.html 315920-28-ref.html
 == 315920-29a.html 315920-29-ref.html
 == 315920-29b.html 315920-29-ref.html
 == 315920-30.html 315920-30-ref.html
 == 316057-1.html 316057-1-ref.html
 == 320979-1.html 320979-1-ref.html
 != 321402-1.html about:blank
 != 321402-2.html about:blank
-== chrome://reftest/content/bugs/321402-3.xul chrome://reftest/content/bugs/321402-3-ref.xul
-== chrome://reftest/content/bugs/321402-4.xul chrome://reftest/content/bugs/321402-4-ref.xul
-== chrome://reftest/content/bugs/321402-5.xul chrome://reftest/content/bugs/321402-5-ref.xul
-== chrome://reftest/content/bugs/321402-6.xul chrome://reftest/content/bugs/321402-6-ref.xul
+== 321402-3.xul 321402-3-ref.xul
+== 321402-4.xul 321402-4-ref.xul
+== 321402-5.xul 321402-5-ref.xul
+== 321402-6.xul 321402-6-ref.xul
 == 321738-1.html 321738-1-ref.html
 pref(layout.css.xul-box-display-values.content.enabled,true) == 322436-1.html 322436-1-ref.html
 == 322461-1.xml 322461-1-ref.html
 == 323656-1.html 323656-1-ref.html
 == 323656-2.html 323656-2-ref.html
 == 323656-3.html 323656-3-ref.html
 == 323656-4.html 323656-4-ref.html
 == 323656-5.svg 323656-5-ref.svg
@@ -450,18 +450,18 @@ random == 328829-1.xhtml 328829-1-ref.xh
 == 332360-width.html 332360-ref.html
 == 332360-width-ltr.html 332360-ltr-ref.html
 == 332557-1.html 332557-1-ref.html
 == 332975-1.html 332975-1-ref.html
 == 333970-1.html 333970-1-ref.html
 == 334829-1a.xhtml 334829-1-ref.xhtml
 == 334829-1b.xhtml 334829-1-ref.xhtml
 == 335628-1.html 335628-1-ref.html
-!= chrome://reftest/content/bugs/335628-2.xul chrome://reftest/content/bugs/335628-2-ref.xul
-== chrome://reftest/content/bugs/336096-1.xul chrome://reftest/content/bugs/336096-1-ref.xul
+!= 335628-2.xul 335628-2-ref.xul
+== 336096-1.xul 336096-1-ref.xul
 == 336147-1.html 336147-1-ref.html
 == 336153-1.html 336153-1-ref.html
 != 338251-p.html about:blank
 == 338251-p-oh.html 338251-p-oh-ref.html
 != 338251-pre.html about:blank
 == 338251-pre-oh.html 338251-pre-oh-ref.html
 fuzzy-if(skiaContent,0-2,0-3) == 339289-1.html 339289-1-ref.html
 == 341043-1a.html 341043-1-ref.html
@@ -575,21 +575,21 @@ fuzzy-if(skiaContent||Android,0-4,0-11) 
 == 363858-6b.html 363858-6-ref.html
 == 363874.html 363874-ref.html
 == 363874-max-width.html 363874-max-width-ref.html
 == 364066-1.html 364066-1-ref.html
 == 364079-1.html 364079-1-ref.html
 == 364318-1.xhtml 364318-1-ref.xhtml
 == 364861-1.html 364861-1-ref.html
 == 364862-1.html 364862-1-ref.html
-== chrome://reftest/content/bugs/364968-1.xul 364968-1-ref.html
+== 364968-1.xul 364968-1-ref.html
 == 364989-1.html 364989-1-ref.html
 == 365173-1.html 365173-1-ref.html
-== chrome://reftest/content/bugs/366207-1.xul chrome://reftest/content/bugs/366207-1-ref.xul
-== chrome://reftest/content/bugs/366616-1.xul chrome://reftest/content/bugs/366616-1-ref.xul
+== 366207-1.xul 366207-1-ref.xul
+== 366616-1.xul 366616-1-ref.xul
 == 367220-1.html 367220-1-ref.html
 == 367247-s-visible.html 367247-s-hidden.html
 == 367247-s-hidden.html 367247-s-auto.html
 fails-if(Android) != 367247-s-auto.html 367247-s-scroll.html
 != 367247-l-visible.html 367247-l-hidden.html
 fails-if(Android&&!asyncPan) != 367247-l-hidden.html 367247-l-scroll.html
 == 367247-l-scroll.html 367247-l-auto.html
 == 367332-1a.html 367332-1-ref.html
@@ -627,17 +627,17 @@ asserts(4) == 368155-negative-margins-1.
 == 368504-3b.html 368504-3-ref.html
 == 368504-4.html 368504-4-ref.html
 == 368504-5.html 368504-5-ref.html
 == 368504-6.html 368504-6-ref.html
 == 368622-1.html 368622-1-ref.html
 == 368651-1.html 368651-1-ref.html
 == 369361-1.html 369361-1-ref.html
 == 369361-2.html 369361-2-ref.html
-== chrome://reftest/content/bugs/369882.xul chrome://reftest/content/bugs/369882-ref.xul
+== 369882.xul 369882-ref.xul
 == 369975-1.html 369975-1.html
 == 370353-1.html 370353-1-ref.html
 == 370422-1.html 370422-1-ref.html
 == 370525-1.html 370525-1-ref.html
 != 370525-1.html 370525-1-notref.html
 == 370525-2.html 370525-2-ref.html
 != 370525-2.html 370525-2-notref.html
 == 370525-rowspan-1a.html 370525-rowspan-1a-ref.html
@@ -673,19 +673,19 @@ random-if(/^Windows\x20NT\x206\.1/.test(
 fuzzy-if(skiaContent&&!Android,0-2,0-40) == 373381-2.html 373381-2-ref.html
 random-if(d2d) == 373381-3.html 373381-3-ref.html
 == 373381-4.html 373381-4-ref.html
 == 373383-1.html 373383-1-ref.html
 == 373433-1.html 373433-1-ref.html
 == 373533-1.xhtml about:blank
 == 373533-2.xhtml about:blank
 == 373533-3.xhtml about:blank
-== chrome://reftest/content/bugs/374038-1.xul chrome://reftest/content/bugs/374038-1-ref.xul
-== chrome://reftest/content/bugs/374038-2.xul chrome://reftest/content/bugs/374038-2-ref.xul
-random-if(d2d) == chrome://reftest/content/bugs/374719-1.xul chrome://reftest/content/bugs/374719-1-ref.xul
+== 374038-1.xul 374038-1-ref.xul
+== 374038-2.xul 374038-2-ref.xul
+random-if(d2d) == 374719-1.xul 374719-1-ref.xul
 fails == 374927-1.html 374927-1-ref.html # Was broken by patch for bug 368600; fails until bug 400776 is fixed
 == 375508-1.html 375508-1-ref.html
 == 375716-1.html 375716-1-ref.html
 == 375827-1.html 375827-1-ref.html
 == 376375-1.html 376375-1-ref.html
 == 376484-1.html 376484-1-ref.html
 == 376532-1.html 376532-1-ref.html
 fails-if(Android) != 376532-2.html 376532-2-ref.html
@@ -855,17 +855,17 @@ fails-if(cocoaWidget||winWidget) random-
 == 400171-1b.html 400171-1-ref.html
 == 400171-1c.html 400171-1-ref.html
 == 400171-2a.html 400171-2-ref.html
 == 400171-2b.html 400171-2-ref.html
 == 400171-2c.html 400171-2-ref.html
 == 400421-1.html 400421-1-ref.html
 == 400813-1.html 400813-1-ref.html
 == 400826-1.html 400826-1-ref.html
-== chrome://reftest/content/bugs/401946-1.xul about:blank
+== 401946-1.xul about:blank
 == 402338-1.html 402338-1-ref.html
 == 402567-1.html 402567-1-ref.html
 == 402567-2.html 402567-2-ref.html
 == 402567-3.html 402567-3-ref.html
 fuzzy-if(gtkWidget,0-2,0-40) == 402567-4.html 402567-4-ref.html
 fuzzy-if(skiaContent,0-2,0-5) == 402629-1.html 402629-1-ref.html
 fuzzy-if(skiaContent,0-2,0-5) == 402629-2.html 402629-2-ref.html
 fuzzy-if(skiaContent,0-2,0-5) == 402629-3.html 402629-3-ref.html
@@ -883,17 +883,17 @@ random == 403134-1.html 403134-1-ref.htm
 fuzzy-if(webrender,130-131,177-177) skip-if(winWidget&&!isDebugBuild&&webrender) == 403181-1.xml 403181-1-ref.xml
 == 403249-1a.html 403249-1-ref.html
 == 403249-1b.html 403249-1-ref.html
 == 403249-2a.html 403249-2-ref.html
 == 403249-2b.html 403249-2-ref.html
 == 403328-1.html 403328-1-ref.html
 == 403426-1.html 403426-1-ref.html
 == 403455-1.html 403455-1-ref.html
-== 403505-1.xml chrome://reftest/content/bugs/403505-1-ref.xul
+== 403505-1.xml 403505-1-ref.xul
 #== 403519-1.html 403519-1-ref.html # Fails on Mac, see also discussion in bug
 == 403519-2.html 403519-2-ref.html
 == 403656-1.html 403656-1-ref.html
 == 403656-2.html 403656-2-ref.html
 == 403656-3.html 403656-3-ref.html
 == 403656-4.html 403656-4-ref.html
 == 403656-5.html 403656-5-ref.html
 #== 403657-1.html 403657-1-ref.html  # Fails depending on the fonts...
@@ -901,17 +901,17 @@ fuzzy-if(webrender,130-131,177-177) skip
 == 403962-1.xhtml 403962-1-ref.xhtml
 == 404030-1.html 404030-1-ref.html
 != 404030-1-notref.html 404030-1.html
 != 404030-1-notref2.html 404030-1.html
 fuzzy-if(skiaContent,0-2,0-4) == 404123-1.html 404123-1-ref.html
 == 404123-2.html 404123-2-ref.html
 != 404123-3.html 404123-3-ref.html
 # may fail "randomly" on OS X, doesn't seem to be rendering usefully anyhow - bug 602469
-random-if(cocoaWidget) == chrome://reftest/content/bugs/404149-1.xul chrome://reftest/content/bugs/404149-1-ref.xul # HTTP for fonts directory access
+random-if(cocoaWidget) == 404149-1.xul 404149-1-ref.xul # HTTP for fonts directory access
 == 404180-1.html 404180-1-ref.html
 == 404301-1.html 404301-1-ref.html
 == 404309-1a.html 404309-1-ref.html
 == 404309-1b.html 404309-1-ref.html
 # Disabled due to compartments for now.
 #!= data:application/xml,<foo/> data:text/plain, # ensure we pretty-print this XML instead of letting it appear blank (test for bug 404419)
 fuzzy-if(Android,0-8,0-50) == 404553-1.html 404553-1-ref.html  # assertion test, also tests that marquee binding is applied correctly
 == 404666-1.html 404666-1-ref.html
@@ -1008,22 +1008,22 @@ fuzzy-if(Android,0-11,0-17) fuzzy-if(web
 == 419531-1.html 419531-1-ref.html
 == 420069-1.html 420069-1-ref.html
 == 420069-2.html 420069-2-ref.html
 == 420351-1.html 420351-1-ref.html
 == 420790-1.xhtml 420790-1-ref.xhtml
 == 421069.html 421069-ref.html
 == 421069.html 421069-ref2.html
 == 421069-ref.html 421069-ref2.html
-== chrome://reftest/content/bugs/421203-1.xul 421203-1-ref.html
-== chrome://reftest/content/bugs/421203-2.xul 421203-1-ref.html
-== chrome://reftest/content/bugs/421203-3.xul chrome://reftest/content/bugs/321402-3-ref.xul
-== chrome://reftest/content/bugs/421203-4.xul chrome://reftest/content/bugs/321402-4-ref.xul
-== chrome://reftest/content/bugs/421203-5.xul chrome://reftest/content/bugs/321402-5-ref.xul
-== chrome://reftest/content/bugs/421203-6.xul chrome://reftest/content/bugs/321402-6-ref.xul
+== 421203-1.xul 421203-1-ref.html
+== 421203-2.xul 421203-1-ref.html
+== 421203-3.xul 321402-3-ref.xul
+== 421203-4.xul 321402-4-ref.xul
+== 421203-5.xul 321402-5-ref.xul
+== 421203-6.xul 321402-6-ref.xul
 == 421234-1.html 421234-1-ref.html
 == 421239-1.html 421239-1-ref.html
 == 421239-2.html 421239-2-ref.html
 == 421419-1.html 421419-1-ref.html
 == 421436-1a.html 421436-1-ref.html
 == 421436-1b.html 421436-1-ref.html
 fuzzy-if(skiaContent,0-1,0-40) == 421632-1.html 421632-1-ref.html
 != 421710-1.html about:blank
@@ -1032,19 +1032,19 @@ fails-if(Android) fuzzy-if(webrender,63-
 == 422249-1.html 422249-1-ref.html
 == 422394-1.html 422394-1-ref.html
 == 422678-1.html 422678-1-ref.html
 == 423130-1.html 423130-1-ref.html
 == 423385-1.html 423385-1-ref.html
 random-if(gtkWidget) == 423599-1.html 423599-1-ref.html # bug 1309095
 == 423676-1.html 423676-1-ref.html
 fails == 423823-1.html 423823-1-ref.html # scrolling rowgroups were removed in bug 28800
-== chrome://reftest/content/bugs/424074-1.xul chrome://reftest/content/bugs/424074-1-ref.xul
-fails-if(Android) != chrome://reftest/content/bugs/424074-1.xul chrome://reftest/content/bugs/424074-1-ref2.xul
-random-if(gtkWidget) == chrome://reftest/content/bugs/424074-1-ref2.xul chrome://reftest/content/bugs/424074-1-ref3.xul
+== 424074-1.xul 424074-1-ref.xul
+fails-if(Android) != 424074-1.xul 424074-1-ref2.xul
+random-if(gtkWidget) == 424074-1-ref2.xul 424074-1-ref3.xul
 == 424236-1.html 424236-1-ref.html
 == 424236-2.html 424236-2-ref.html
 == 424236-3.html 424236-3-ref.html
 == 424236-4.html 424236-4-ref.html
 == 424236-5.html 424236-5-ref.html
 == 424236-6.html 424236-6-ref.html
 == 424236-7.html 424236-7-ref.html
 == 424236-8.html 424236-8-ref.html
@@ -1200,17 +1200,17 @@ fuzzy-if(webrender,0-4,0-361) == 449519-
 == 452915-1.html 452915-1-ref.html
 == 452964-1.html 452964-1-ref.html
 == 454361.html about:blank
 == 455105-1.html 455105-ref.html
 == 455105-2.html 455105-ref.html
 == 455171-5.html 455171-5-ref.html
 == 455280-1.xhtml 455280-1-ref.xhtml
 == 455826-1.html 455826-1-ref.html
-fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xul 456147-ref.html # bug 458047
+fails-if(Android||cocoaWidget||winWidget) == 456147.xul 456147-ref.html # bug 458047
 fuzzy-if(Android,0-11,0-41) fuzzy-if(winWidget||gtkWidget,0-4,0-6) fuzzy-if(d2d,0-16,0-95) fuzzy-if(skiaContent,0-42,0-154) fuzzy-if(webrender,56-60,449-497) == 456219-1a.html 456219-1-ref.html # bug 1128229
 fuzzy-if(Android,0-11,0-41) fuzzy-if(winWidget||gtkWidget,0-4,0-6) fuzzy-if(d2d,0-16,0-99) fuzzy-if(skiaContent,0-42,0-154) fuzzy-if(webrender,56-60,449-497) == 456219-1b.html 456219-1-ref.html # bug 1128229
 fuzzy-if(Android,0-11,0-41) fuzzy-if(winWidget||gtkWidget,0-4,0-6) fuzzy-if(d2d,0-16,0-99) fuzzy-if(skiaContent,0-42,0-154) fuzzy-if(webrender,56-60,449-497) == 456219-1c.html 456219-1-ref.html # bug 1128229
 fuzzy-if(skiaContent,0-1,0-45) fuzzy-if(webrender,9-9,8-8) == 456219-2.html 456219-2-ref.html
 == 456330-1.gif 456330-1-ref.png
 == 456484-1.html 456484-1-ref.html
 == 457398-1.html 457398-1-ref.html
 == 457398-2.html 457398-2-ref.html
@@ -1238,40 +1238,40 @@ fuzzy-if(skiaContent,0-1,0-5) == 459443-
 == 460012-1.html 460012-1-ref.html
 == 461266-1.html 461266-1-ref.html
 fuzzy-if(skiaContent||webrender,0-1,0-31200) == 461512-1.html 461512-1-ref.html
 == 462844-1.html 462844-ref.html
 == 462844-2.html 462844-ref.html
 == 462844-3.html 462844-ref.html
 == 462844-4.html 462844-ref.html
 == 463204-1.html 463204-1-ref.html
-fuzzy-if(webrender,16-16,3392-3483) == chrome://reftest/content/bugs/463217-1.xul chrome://reftest/content/bugs/463217-1-ref.xul
+fuzzy-if(webrender,16-16,3392-3483) == 463217-1.xul 463217-1-ref.xul
 == 463952-1.html 463952-1-ref.html
 == 464811-1.html 464811-1-ref.html
 == 465574-1.html 465574-1-ref.html # bug 421436
 == 466258-1.html 466258-1-ref.html
 == 466395-1.html 466395-1-ref.html
 == 466395-2.html 466395-2-ref.html
 == 467084-1.html 467084-1-ref.html
 == 467084-2.html 467084-2-ref.html
 == 467444-1.html 467444-1-ref.html
 == 467460-1.html 467460-1-ref.html
-== chrome://reftest/content/bugs/468473-1.xul chrome://reftest/content/bugs/468473-1-ref.xul
+== 468473-1.xul 468473-1-ref.xul
 == 468546-1.xhtml 468546-1-ref.xhtml
 == 471356-1.html 471356-1-ref.html
 == 471594-1.xhtml 471594-1-ref.html
-fuzzy(0-255,0-15) == chrome://reftest/content/bugs/472020-1a.xul chrome://reftest/content/bugs/472020-1-ref.xul
-fails == chrome://reftest/content/bugs/472020-1b.xul chrome://reftest/content/bugs/472020-1-ref.xul
-fails == chrome://reftest/content/bugs/472020-2.xul chrome://reftest/content/bugs/472020-2-ref.xul
-== chrome://reftest/content/bugs/472500-1.xul chrome://reftest/content/bugs/472500-1-ref.xul
+fuzzy(0-255,0-15) == 472020-1a.xul 472020-1-ref.xul
+fails == 472020-1b.xul 472020-1-ref.xul
+fails == 472020-2.xul 472020-2-ref.xul
+== 472500-1.xul 472500-1-ref.xul
 == 472769-1a.html 472769-1-ref.html
 == 472769-1b.html 472769-1-ref.html
 == 472769-2.html 472769-2-ref.html
 == 472769-3.html 472769-3-ref.html
-== chrome://reftest/content/bugs/473847-1.xul chrome://reftest/content/bugs/473847-1-ref.xul
+== 473847-1.xul 473847-1-ref.xul
 == 474417-1.html 474417-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 474472-1.html 474472-1-ref.html
 == 475986-1a.html 475986-1-ref.html
 == 475986-1b.html 475986-1-ref.html
 == 475986-1c.html 475986-1-ref.html
 == 475986-1d.html 475986-1-ref.html
 == 475986-1e.html 475986-1-ref.html
 == 475986-1f.html 475986-1-ref.html
@@ -1293,17 +1293,17 @@ fuzzy-if(skiaContent,0-1,0-5) == 474472-
 == 476063-4.xhtml 476063-4-ref.xhtml
 == 476357-1.html 476357-1-ref.html
 == 476598-1a.html 476598-1-ref.html
 == 476598-1a.html 476598-1-ref2.html
 == 476598-1b.html 476598-1-ref.html
 == 476598-1b.html 476598-1-ref2.html
 != 476598-1-ref.html about:blank
 == 476856-1.html 476856-1-ref.html
-pref(layout.css.xul-tree-pseudos.content.enabled,true) random-if(d2d) == chrome://reftest/content/bugs/478377-1.xul chrome://reftest/content/bugs/478377-1-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) random-if(d2d) == 478377-1.xul 478377-1-ref.xul
 == 478614-1.html 478614-1-ref.html
 == 478614-2.html 478614-1-ref.html
 == 478614-3.html 478614-3-ref.html
 == 478614-4.html 478614-4-ref.html
 == 478614-5.html 478614-5-ref.html
 == 478614-6.html 478614-6-ref.html
 == 478614-7.html 478614-7-ref.html
 == 478811-1.html 478811-1-ref.html
@@ -1331,17 +1331,17 @@ fails-if(Android) == 481024-1c.html 4810
 fails-if(Android||gtkWidget) random-if(winWidget||cocoaWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
 == 482398-1.html 482398-1-ref.html
 random-if(d2d) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
 random-if(d2d) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
 random-if(winWidget) fuzzy-if(skiaContent,0-1,0-5) == 482659-1a.html 482659-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 482659-1b.html 482659-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 482659-1c.html 482659-1-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 482659-1d.html 482659-1-ref.html
-== chrome://reftest/content/bugs/483565.xul chrome://reftest/content/bugs/483565-ref.xul
+== 483565.xul 483565-ref.xul
 == 484256-1.html 484256-1-ref.html
 == 484256-2.html 484256-1-ref.html
 == 485012-1.html 485012-1-ref.html
 == 485275-1.html 485275-1-ref.html
 == 485275-1.svg 485275-1-ref.html
 == 486052-1.html 486052-1-ref.html
 == 486052-2a.html 486052-2-ref.html
 == 486052-2b.html 486052-2-ref.html
@@ -1360,18 +1360,18 @@ fuzzy-if(skiaContent,0-1,0-5) == 482659-
 == 490173-1.html 490173-1-ref.html
 == 490173-2.html 490173-2-ref.html
 == 490176-1.html 490176-1-ref.html
 == 490177-1.svg 490177-1-ref.svg
 == 490182-1a.html 490182-1-ref.html
 == 490182-1b.html 490182-1-ref.html
 pref(browser.display.focus_ring_width,1) == 491180-1.html 491180-1-ref.html
 pref(browser.display.focus_ring_width,1) == 491180-2.html 491180-2-ref.html
-== chrome://reftest/content/bugs/491323-1.xul chrome://reftest/content/bugs/491323-1-ref.xul
-== chrome://reftest/content/bugs/492239-1.xul chrome://reftest/content/bugs/492239-1-ref.xul
+== 491323-1.xul 491323-1-ref.xul
+== 492239-1.xul 492239-1-ref.xul
 == 492661-1.html 492661-1-ref.html
 == 493968-1.html 493968-1-ref.html
 == 494667-1.html 494667-1-ref.html
 == 494667-2.html 494667-2-ref.html
 == 495274-1.html 495274-1-ref.html
 == 495354-1a.xhtml 495354-1-ref.xhtml
 == 495354-1b.xhtml 495354-1-ref.xhtml
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 495385-1a.html 495385-1-ref.html # Bug 1392106
@@ -1411,29 +1411,29 @@ needs-focus fails == 503531-1.html 50353
 fuzzy-if(Android,0-5,0-2800) == 506481-1.html 506481-1-ref.html
 == 507187-1.html 507187-1-ref.html
 == 507487-1.html 507487-1-ref.html
 == 507487-2.xhtml 507487-2-ref.xhtml
 == 507762-1.html 507762-1-ref.html
 == 507762-2.html 507762-2-ref.html
 == 507762-3.html 507762-1-ref.html
 == 507762-4.html 507762-2-ref.html
-random == chrome://reftest/content/bugs/508816-1.xul chrome://reftest/content/bugs/508816-1-ref.xul # Bug 1375012
+random == 508816-1.xul 508816-1-ref.xul # Bug 1375012
 pref(layout.css.xul-box-display-values.content.enabled,true) == 508816-2.html 508816-2-ref.html
-skip-if(isDebugBuild) == chrome://reftest/content/bugs/508908-1.xul chrome://reftest/content/bugs/508908-1-ref.xul
+skip-if(isDebugBuild) == 508908-1.xul 508908-1-ref.xul
 == 508919-1.xhtml 508919-1-ref.xhtml
 == 509155-1.xhtml 509155-1-ref.xhtml
 fuzzy-if(Android,0-5,0-1656) fuzzy-if(skiaContent,0-1,0-1200) == 512410.html 512410-ref.html
 == 512631-1.html 512631-1-ref.html
 == 513153-1a.html 513153-1-ref.html
 == 513153-1b.html 513153-1-ref.html
 fuzzy-if(webrender&&winWidget,82-82,76-76) == 513153-2a.html 513153-2-ref.html
 fuzzy-if(webrender&&OSX,34-34,138-138) == 513153-2b.html 513153-2-ref.html
-== chrome://reftest/content/bugs/513318-1.xul chrome://reftest/content/bugs/513318-1-ref.xul
-fails-if(Android&&(!asyncPan)) != chrome://reftest/content/bugs/513318-2.xul chrome://reftest/content/bugs/513318-2-ref.xul
+== 513318-1.xul 513318-1-ref.xul
+fails-if(Android&&(!asyncPan)) != 513318-2.xul 513318-2-ref.xul
 == 514917-1.html 514917-1-ref.html
 == 518172-1a.html 518172-a-ref.html
 fuzzy-if(winWidget,0-73,0-133) fuzzy-if(cocoaWidget,0-103,0-133) == 518172-1b.html 518172-b-ref.html
 == 518172-2a.html 518172-a-ref.html
 fuzzy-if(winWidget,0-73,0-133) fuzzy-if(cocoaWidget,0-103,0-133) == 518172-2b.html 518172-b-ref.html
 == 520421-1.html 520421-1-ref.html
 == 520563-1.xhtml 520563-1-ref.xhtml
 fuzzy-if(skiaContent,0-1,0-3) == 521525-1.html 521525-1-ref.html
@@ -1463,17 +1463,17 @@ fuzzy-if(Android,0-2,0-48) == 531200-1.h
 == 534526-1a.html 534526-1-ref.html
 == 534526-1b.html 534526-1-ref.html
 == 534804-1.html 534804-1-ref.html
 == 534808-1.html 534808-1-ref.html
 == 534808-2.html 534808-2-ref.html
 == 534919-1.html 534919-1-ref.html
 random == 536061.html 536061-ref.html # fixedpoint division in blur code makes this fail
 == 537471-1.html 537471-1-ref.html
-== chrome://reftest/content/bugs/537507-1.xul chrome://reftest/content/bugs/537507-1-ref.xul
+== 537507-1.xul 537507-1-ref.xul
 == 537507-2.html 537507-2-ref.html
 == 538909-1.html 538909-1-ref.html
 == 538935-1.html 538935-1-ref.html
 == 539226-1.html about:blank
 == 539323-1.html 539323-1-ref.html
 == 539323-2.html 539323-2-ref.html
 == 539323-3.html 539323-3-ref.html
 == 539880-1.html 539880-1-ref.html
@@ -1504,17 +1504,17 @@ fuzzy-if(Android,0-12,0-300) == 551463-1
 # Marked "random" rather than "fails" because it may (spuriously) appear to pass
 # on Android devices that completely lack any Sinhala font support.
 random != 553571-1.html 553571-1-notref.html # expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
 fuzzy-if(!contentSameGfxBackendAsCanvas,0-128,0-91) random-if(d2d) skip-if(azureSkiaGL) fuzzy-if(skiaContent,0-32,0-150) == 555388-1.html 555388-1-ref.html
 == 556661-1.html 556661-1-ref.html
 fuzzy-if(skiaContent,0-4,0-5) == 557087-1.html 557087-ref.html
 fuzzy-if(skiaContent&&!Android,0-2,0-5) == 557087-2.html 557087-ref.html
 == 557736-1.html 557736-1-ref.html
-skip-if(Android) != chrome://reftest/content/bugs/558011-1.xul chrome://reftest/content/bugs/558011-1-ref.xul
+skip-if(Android) != 558011-1.xul 558011-1-ref.xul
 == 559284-1.html 559284-1-ref.html
 fuzzy-if(skiaContent,0-2,0-5) == 561981-1.html 561981-1-ref.html
 == 561981-2.html 561981-2-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 561981-3.html 561981-3-ref.html
 == 561981-4.html 561981-4-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 561981-5.html 561981-5-ref.html
 == 561981-6.html 561981-6-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 561981-7.html 561981-7-ref.html
@@ -1693,22 +1693,22 @@ HTTP == 652991-4.html 652991-4-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 653930-1.html 653930-1-ref.html
 == 654057-1.html 654057-1-ref.html
 fuzzy-if(skiaContent,0-1,0-65536) == 654950-1.html 654950-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
 == 655549-1.html 655549-1-ref.html
 == 655836-1.html 655836-1-ref.html
 != 656875.html about:blank
 == 658952.html 658952-ref.html
 fuzzy-if(skiaContent,0-10,0-919) fuzzy-if(webrender&&cocoaWidget,2-2,4-4) == 660682-1.html 660682-1-ref.html
-pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(d2d,0-1,0-256) skip-if(Android) fuzzy-if(skiaContent,0-1,0-68000) == chrome://reftest/content/bugs/664127-1.xul chrome://reftest/content/bugs/664127-1-ref.xul # Android: Intermittent failures - bug 1019131
+pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(d2d,0-1,0-256) skip-if(Android) fuzzy-if(skiaContent,0-1,0-68000) == 664127-1.xul 664127-1-ref.xul # Android: Intermittent failures - bug 1019131
 == 665597-1.html 665597-1-ref.html
 == 665597-2.html 665597-2-ref.html
 == 667079-1.html 667079-1-ref.html
-pref(layout.css.xul-tree-pseudos.content.enabled,true) == chrome://reftest/content/bugs/668319-1.xul about:blank
-!= chrome://reftest/content/bugs/669015-1.xul chrome://reftest/content/bugs/669015-1-notref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) == 668319-1.xul about:blank
+!= 669015-1.xul 669015-1-notref.xul
 skip-if(azureSkiaGL) == 670442-1.html 670442-1-ref.html
 == 670467-1.html 670467-1-ref.html
 == 670467-2.html 670467-2-ref.html
 == 690164-1.html 690164-1-ref.html
 == 690643-1.html 690643-1-ref.html
 != 691087-1.html 691087-1-ref.html
 == 691571-1.html 691571-1-ref.html
 fuzzy-if(skiaContent,0-1,0-200) == 696307-1.html 696307-1-ref.html
@@ -1947,17 +1947,17 @@ pref(apz.allow_zooming,true) skip-if(!An
 pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-8) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html
 pref(apz.allow_zooming,true) skip-if(!Android) != 1133905-ref-vh-rtl.html about:blank # make sure it doesn't render blank
 == 1149304-1-transform-change.html 1149304-1-transform-change-ref.html
-== chrome://reftest/content/bugs/1150021-1.xul chrome://reftest/content/bugs/1150021-1-ref.xul
+== 1150021-1.xul 1150021-1-ref.xul
 == 1151145-1.html 1151145-1-ref.html
 == 1151306-1.html 1151306-1-ref.html
 == 1153845-1.html 1153845-1-ref.html
 == 1155828-1.html 1155828-1-ref.html
 fuzzy-if(skiaContent,0-7,0-84) == 1156129-1.html 1156129-1-ref.html
 pref(dom.use_xbl_scopes_for_remote_xul,true) HTTP(..) == 1157127-1.html 1157127-1-ref.html
 fuzzy-if(Android,0-6,0-6) == 1169331-1.html 1169331-1-ref.html
 fuzzy(0-1,0-74) fails-if(Android||gtkWidget) == 1174332-1.html 1174332-1-ref.html # bug 1312658
@@ -2089,17 +2089,17 @@ fuzzy-if(Android,0-66,0-574) fuzzy-if(d2
 == 1432541.html 1432541-ref.html
 pref(layout.css.moz-document.url-prefix-hack.enabled,true) == 1446470.html 1035091-ref.html
 pref(layout.css.moz-document.url-prefix-hack.enabled,false) == 1446470-2.html 1035091-ref.html
 == 1456111-1.html about:blank
 test-pref(layout.css.contain.enabled,false) == 1466008.html 1466008-ref.html
 fuzzy(0-1,0-625) == 1466638-1.html 1466638-1-ref.html
 == bug1472465-1.html bug1472465-1-ref.html
 == 1475971-1.html 1475971-1-ref.html
-== chrome://reftest/content/bugs/1483649-1.xul chrome://reftest/content/bugs/1483649-1-ref.xul
+== 1483649-1.xul 1483649-1-ref.xul
 test-pref(layout.css.contain.enabled,true) == 1483946.html 1483946-ref.html
 test-pref(layout.css.visited_links_enabled,false) == 1488155.html 1488155-ref.html
 == 1492660-1.html 1492660-1-ref.html
 pref(layout.css.supports-selector.enabled,true) == 1499386.html 1499386-ref.html
 pref(layout.css.supports-selector.enabled,false) != 1499386.html 1499386-ref.html
 == 1509425-1.html 1509425-1-ref.html
 == 1511570.html 1511570-ref.html
 fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview,1-2,64-141) == 1529992-1.html 1529992-1-ref.html
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -12,21 +12,21 @@ fuzzy-if(Android,0-8,0-604) == display-c
 fuzzy-if(winWidget,0-12,0-100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
 == display-contents-tables.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-2.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml
 == display-contents-visibility-hidden.html display-contents-visibility-hidden-ref.html
 == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html
 == display-contents-495385-2d.html display-contents-495385-2d-ref.html
 fuzzy-if(Android,0-7,0-3935) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == display-contents-xbl.xhtml display-contents-xbl-ref.html # bug 1392106
-== chrome://reftest/content/css-display/display-contents-xbl-2.xul chrome://reftest/content/css-display/display-contents-xbl-2-ref.xul
-== chrome://reftest/content/css-display/display-contents-xbl-3.xul chrome://reftest/content/css-display/display-contents-xbl-3-ref.xul
-skip == chrome://reftest/content/css-display/display-contents-xbl-4.xul chrome://reftest/content/css-display/display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
+== display-contents-xbl-2.xul display-contents-xbl-2-ref.xul
+== display-contents-xbl-3.xul display-contents-xbl-3-ref.xul
+skip == display-contents-xbl-4.xul display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
 asserts(0-1) fuzzy-if(Android,0-8,0-3216) == display-contents-fieldset.html display-contents-fieldset-ref.html # bug 1089223
-== chrome://reftest/content/css-display/display-contents-xbl-5.xul chrome://reftest/content/css-display/display-contents-xbl-3-ref.xul
+== display-contents-xbl-5.xul display-contents-xbl-3-ref.xul
 == display-contents-xbl-6.xhtml display-contents-xbl-6-ref.html
 == display-contents-xbl-7.xhtml display-contents-xbl-7-ref.html
 == display-contents-list-item-child.html display-contents-list-item-child-ref.html
 == display-contents-dyn-insert-text.html display-contents-dyn-insert-text-ref.html
 == display-contents-writing-mode-1.html display-contents-writing-mode-1-ref.html
 == display-contents-writing-mode-2.html display-contents-writing-mode-2-ref.html
 needs-focus == display-contents-state-change.html display-contents-state-change-ref.html
 == display-flow-root-001.html display-flow-root-001-ref.html
--- a/layout/reftests/forms/input/file/reftest.list
+++ b/layout/reftests/forms/input/file/reftest.list
@@ -1,11 +1,11 @@
-fuzzy-if(gtkWidget||webrender,0-1,0-34) fails-if(Android) == simple.html chrome://reftest/content/forms/input/file/simple-ref.xul
-fuzzy-if(gtkWidget||webrender,0-1,0-17) fails-if(Android) == rtl.html chrome://reftest/content/forms/input/file/rtl-ref.xul
-fuzzy-if(gtkWidget||webrender,0-1,0-34) fails-if(Android) == size.html chrome://reftest/content/forms/input/file/simple-ref.xul
-fuzzy-if(gtkWidget||webrender,0-1,0-10) fails-if(Android) == background.html chrome://reftest/content/forms/input/file/background-ref.xul
-fuzzy-if(gtkWidget,0-1,0-10) fails-if(Android) == style.html chrome://reftest/content/forms/input/file/style-ref.xul
+fuzzy-if(gtkWidget||webrender,0-1,0-34) fails-if(Android) == simple.html simple-ref.xul
+fuzzy-if(gtkWidget||webrender,0-1,0-17) fails-if(Android) == rtl.html rtl-ref.xul
+fuzzy-if(gtkWidget||webrender,0-1,0-34) fails-if(Android) == size.html simple-ref.xul
+fuzzy-if(gtkWidget||webrender,0-1,0-10) fails-if(Android) == background.html background-ref.xul
+fuzzy-if(gtkWidget,0-1,0-10) fails-if(Android) == style.html style-ref.xul
 != width-clip.html width-clip-ref.html
 fails-if(Android) == color-inherit.html color-inherit-ref.html
 fuzzy-if(Android,0-2,0-2) fuzzy-if(OSX,0-34,0-134) fails-if(webrender&&!cocoaWidget) == dynamic-max-width.html dynamic-max-width-ref.html # bug 1496542 for webrender.
 == label-min-inline-size.html label-min-inline-size-ref.html
 == css-overflow.html css-overflow-ref.html
 == css-display.html css-display-ref.html
--- a/layout/reftests/forms/input/text/reftest.list
+++ b/layout/reftests/forms/input/text/reftest.list
@@ -1,11 +1,11 @@
 == bounds-1.html bounds-1-ref.html
 fuzzy-if(asyncPan&&!layersGPUAccelerated,0-151,0-111) fuzzy-if(webrender,0-65,0-3) == size-1.html size-1-ref.html
 == size-2.html size-2-ref.html
 == baseline-1.html baseline-1-ref.html
-== chrome://reftest/content/forms/input/text/centering-1.xul chrome://reftest/content/forms/input/text/centering-1-ref.xul
-== chrome://reftest/content/forms/input/text/dynamic-height-1.xul chrome://reftest/content/forms/input/text/dynamic-height-1-ref.xul
+== centering-1.xul centering-1-ref.xul
+== dynamic-height-1.xul dynamic-height-1-ref.xul
 fuzzy-if(skiaContent,0-1,0-500) needs-focus == select.html select-ref.html
 == intrinsic-size.html intrinsic-size-ref.html
 == line-height-0.5.html line-height-1.0.html
 != line-height-1.5.html line-height-1.0.html
 == shadow-rules.html shadow-rules-ref.html
--- a/layout/reftests/forms/placeholder/reftest.list
+++ b/layout/reftests/forms/placeholder/reftest.list
@@ -22,14 +22,14 @@ skip-if(Android&&asyncPan) == placeholde
 # needs-focus == placeholder-8.html placeholder-focus-ref.html
 # needs-focus == placeholder-9.html placeholder-focus-ref.html
 needs-focus == placeholder-10.html placeholder-visible-ref.html
 == placeholder-11.html placeholder-visible-ref.html
 == placeholder-12.html placeholder-visible-ref.html
 == placeholder-13.html placeholder-visible-ref.html
 == placeholder-14.html placeholder-visible-ref.html
 == placeholder-18.html placeholder-overridden-ref.html
-random-if(winWidget) == chrome://reftest/content/forms/placeholder/placeholder-19.xul  chrome://reftest/content/forms/placeholder/placeholder-overridden-ref.xul
+random-if(winWidget) == placeholder-19.xul  placeholder-overridden-ref.xul
 # needs-focus == placeholder-20.html placeholder-focus-ref.html
 needs-focus == placeholder-21.html placeholder-blank-ref.html
 needs-focus == placeholder-22.html placeholder-blank-ref.html
 == placeholder-rtl.html placeholder-rtl-ref.html
 pref(dom.placeholder.show_on_focus,false) needs-focus == placeholder-focus-pref.html placeholder-blank-ref.html
--- a/layout/reftests/forms/textbox/reftest.list
+++ b/layout/reftests/forms/textbox/reftest.list
@@ -1,11 +1,11 @@
 # access-key tests are no use on OS X because access keys are not indicated visually
 # no real XUL theme on Android so we just skip
-skip-if(cocoaWidget||Android) != chrome://reftest/content/forms/textbox/accesskey-1.xul chrome://reftest/content/forms/textbox/accesskey-1-notref.xul
-skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xul chrome://reftest/content/forms/textbox/accesskey-2-ref.xul
+skip-if(cocoaWidget||Android) != accesskey-1.xul accesskey-1-notref.xul
+skip-if(cocoaWidget||Android) fails-if(webrender) == accesskey-2.xul accesskey-2-ref.xul
 # accesskey-3 fails because of defects in XUL bidi support
-fails-if(!cocoaWidget) skip-if(cocoaWidget||Android) == chrome://reftest/content/forms/textbox/accesskey-3.xul chrome://reftest/content/forms/textbox/accesskey-3-ref.xul
-skip-if(cocoaWidget||Android) != chrome://reftest/content/forms/textbox/accesskey-3.xul chrome://reftest/content/forms/textbox/accesskey-3-notref.xul
-skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-4.xul chrome://reftest/content/forms/textbox/accesskey-4-ref.xul
-skip-if(cocoaWidget||Android) != chrome://reftest/content/forms/textbox/accesskey-4.xul chrome://reftest/content/forms/textbox/accesskey-4-notref.xul
-skip-if(Android) == chrome://reftest/content/forms/textbox/align-baseline-1.xul chrome://reftest/content/forms/textbox/align-baseline-1-ref.xul # test for bug 494901
-skip-if(Android) == chrome://reftest/content/forms/textbox/setsize.xul chrome://reftest/content/forms/textbox/setsize-ref.xul
+fails-if(!cocoaWidget) skip-if(cocoaWidget||Android) == accesskey-3.xul accesskey-3-ref.xul
+skip-if(cocoaWidget||Android) != accesskey-3.xul accesskey-3-notref.xul
+skip-if(cocoaWidget||Android) fails-if(webrender) == accesskey-4.xul accesskey-4-ref.xul
+skip-if(cocoaWidget||Android) != accesskey-4.xul accesskey-4-notref.xul
+skip-if(Android) == align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
+skip-if(Android) == setsize.xul setsize-ref.xul
--- a/layout/reftests/image-region/reftest.list
+++ b/layout/reftests/image-region/reftest.list
@@ -1,1 +1,1 @@
-== chrome://reftest/content/image-region/image-region.xul chrome://reftest/content/image-region/image-region-ref.xul
+== image-region.xul image-region-ref.xul
--- a/layout/reftests/invalidation/reftest.list
+++ b/layout/reftests/invalidation/reftest.list
@@ -1,16 +1,16 @@
 == table-repaint-a.html table-repaint-a-ref.html
 == table-repaint-b.html table-repaint-b-ref.html
 == table-repaint-border-collapse.html table-repaint-border-collapse-ref.html
 == table-repaint-c.html table-repaint-c-ref.html
 == table-repaint-d.html table-repaint-d-ref.html
 == table-repaint-e.html table-repaint-e-ref.html
 == table-repaint-non-border-collapse.html table-repaint-non-border-collapse-ref.html
-== chrome://reftest/content/invalidation/540247-1.xul chrome://reftest/content/invalidation/540247-1-ref.xul
+== 540247-1.xul 540247-1-ref.xul
 == 543681-1.html 543681-1-ref.html
 == 1243409-1.html 1243409-1-ref.html
 skip == test-image-layers.html test-image-layers-ref.html # Bug 1067360
 skip == test-image-layers-multiple-displayitem.html test-image-layers-ref.html # Bug 1067360
 pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers.html test-animated-image-layers-ref.html
 pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
 == box-shadow-border-radius.html box-shadow-border-radius-ref.html
 == filter-userspace-offset.svg?offsetContainer=rect filter-userspace-offset.svg
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -24,51 +24,51 @@ needs-focus == listbox-nonnative-when-st
 fails-if(!nativeThemePref) != radio-native.html radio-nonnative.html
 == radio-still-native-when-styled.html radio-still-native-when-styled-ref.html
 fails-if(!nativeThemePref) != checkbox-native.html checkbox-nonnative.html
 == checkbox-still-native-when-styled.html checkbox-still-native-when-styled-ref.html
 == native-theme-disabled-cascade-levels.html native-theme-disabled-cascade-levels-ref.html
 
 != 427122-1.html 427122-1-ref.html
 
-== chrome://reftest/content/native-theme/470711-1.xul chrome://reftest/content/native-theme/470711-1-ref.xul
+== 470711-1.xul 470711-1-ref.xul
 
-== chrome://reftest/content/native-theme/482955-1.xul chrome://reftest/content/native-theme/482955-1-ref.xul
+== 482955-1.xul 482955-1-ref.xul
 
 == 492155-1.html about:blank
 == 492155-2.html about:blank
 == 492155-3.html about:blank
 fails-if(Android&&!asyncPan) != 492155-4.html about:blank
 
 != box-shadow-input.html box-shadow-input-ref.html
 != box-shadow-button.html box-shadow-button-ref.html
 != box-shadow-listbox.html box-shadow-listbox-ref.html
 != box-shadow-combobox.html box-shadow-combobox-ref.html
 
 # RTL mirroring tests
 == checkbox-not-mirrored-when-rtl.html checkbox-not-mirrored-when-rtl-ref.html
-skip-if(!cocoaWidget) == chrome://reftest/content/native-theme/menulist-mirrored-when-rtl.xul chrome://reftest/content/native-theme/menulist-mirrored-when-rtl-ref.xul
-skip-if(!cocoaWidget) == chrome://reftest/content/native-theme/searchfield-mirrored-when-rtl.xul chrome://reftest/content/native-theme/searchfield-mirrored-when-rtl-ref.xul
+skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-rtl-ref.xul
+skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl-ref.xul
 skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl-ref.html
 
-!= chrome://reftest/content/native-theme/resizer-bottomend.xul chrome://reftest/content/native-theme/blank-window.xul
-random-if(d2d) == chrome://reftest/content/native-theme/resizer-bottomend.xul chrome://reftest/content/native-theme/resizer-bottomright.xul # bug 581086
-!= chrome://reftest/content/native-theme/resizer-bottomend.xul chrome://reftest/content/native-theme/resizer-bottomend-rtl.xul
+!= resizer-bottomend.xul blank-window.xul
+random-if(d2d) == resizer-bottomend.xul resizer-bottomright.xul # bug 581086
+!= resizer-bottomend.xul resizer-bottomend-rtl.xul
 # Disabled on Linux (bug 519152), random on Windows (bug 581086)
-skip-if(gtkWidget) != chrome://reftest/content/native-theme/resizer-bottomend-rtl.xul chrome://reftest/content/native-theme/blank-window.xul
-skip-if(gtkWidget) random-if(d2d) == chrome://reftest/content/native-theme/resizer-bottomend-rtl.xul chrome://reftest/content/native-theme/resizer-bottomend-flipped.xul
-skip-if(gtkWidget) == chrome://reftest/content/native-theme/resizer-bottomleft-rtl.xul chrome://reftest/content/native-theme/resizer-bottomleft.xul
-skip-if(gtkWidget) == chrome://reftest/content/native-theme/resizer-bottomright-rtl.xul chrome://reftest/content/native-theme/resizer-bottomright.xul
+skip-if(gtkWidget) != resizer-bottomend-rtl.xul blank-window.xul
+skip-if(gtkWidget) random-if(d2d) == resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul
+skip-if(gtkWidget) == resizer-bottomleft-rtl.xul resizer-bottomleft.xul
+skip-if(gtkWidget) == resizer-bottomright-rtl.xul resizer-bottomright.xul
 
-!= chrome://reftest/content/native-theme/resizer-bottomstart.xul chrome://reftest/content/native-theme/blank-window.xul
-random-if(d2d) == chrome://reftest/content/native-theme/resizer-bottomstart.xul chrome://reftest/content/native-theme/resizer-bottomleft.xul
-random-if(d2d) == chrome://reftest/content/native-theme/resizer-bottomstart.xul chrome://reftest/content/native-theme/resizer-left.xul
-!= chrome://reftest/content/native-theme/resizer-bottomstart.xul chrome://reftest/content/native-theme/resizer-bottomstart-rtl.xul
-skip-if(gtkWidget) != chrome://reftest/content/native-theme/resizer-bottomstart-rtl.xul chrome://reftest/content/native-theme/blank-window.xul
-skip-if(gtkWidget) random-if(d2d) == chrome://reftest/content/native-theme/resizer-bottomstart-rtl.xul chrome://reftest/content/native-theme/resizer-bottomend.xul
+!= resizer-bottomstart.xul blank-window.xul
+random-if(d2d) == resizer-bottomstart.xul resizer-bottomleft.xul
+random-if(d2d) == resizer-bottomstart.xul resizer-left.xul
+!= resizer-bottomstart.xul resizer-bottomstart-rtl.xul
+skip-if(gtkWidget) != resizer-bottomstart-rtl.xul blank-window.xul
+skip-if(gtkWidget) random-if(d2d) == resizer-bottomstart-rtl.xul resizer-bottomend.xul
 
 # Windows-only, depends on native scrollbar metrics
 skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme-ref.html
 # skip-if(!winWidget) == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme-ref.html # Bug 512206
 
 == border-radius.html border-radius-ref.html
 
 == checkbox-dynamic-1.html checkbox-dynamic-1-ref.html
@@ -76,9 +76,9 @@ skip-if(!winWidget) == scroll-thumb-mini
 # These tests have been written to test the overflow of the window widget
 # (bug 568825) but we can't test it on Windows and Cocoa because they have
 # animated progress bars.
 # Nothing shows up on Android, presumably because that appearance type is
 # not implemented.
 skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
 fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow-small.html progress-nobar.html
 
-== chrome://reftest/content/native-theme/676387-1.xul chrome://reftest/content/native-theme/676387-1-ref.xul
+== 676387-1.xul 676387-1-ref.xul
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -1,14 +1,14 @@
 == data:text/html,<body> about:blank
 == data:text/plain, about:blank
 != data:text/plain,HELLO about:blank
 
 # these tests make sure async reftests work:
-== chrome://reftest/content/reftest-sanity/test-async.xul chrome://reftest/content/reftest-sanity/test-async-ref.xul
+== test-async.xul test-async-ref.xul
 == test-async.html test-async-ref.html
 
 # test that zoom works (and really zooms, not just scales)
 == test-zoom.html test-zoom-ref.html
 
 # make sure we don't fall over if the root is missing
 == no-root.html about:blank
 
--- a/layout/reftests/text-shadow/reftest.list
+++ b/layout/reftests/text-shadow/reftest.list
@@ -1,15 +1,15 @@
 == 723669.html 723669-ref.html
 
-== chrome://reftest/content/text-shadow/basic.xul chrome://reftest/content/text-shadow/basic-ref.xul
-random-if(Android) == chrome://reftest/content/text-shadow/basic-negcoord.xul chrome://reftest/content/text-shadow/basic-negcoord-ref.xul
-!= chrome://reftest/content/text-shadow/blur.xul chrome://reftest/content/text-shadow/blur-notref.xul
-== chrome://reftest/content/text-shadow/color-inherit.xul chrome://reftest/content/text-shadow/color-inherit-ref.xul
-== chrome://reftest/content/text-shadow/multiple-noblur.xul chrome://reftest/content/text-shadow/multiple-noblur-ref.xul
+== basic.xul basic-ref.xul
+random-if(Android) == basic-negcoord.xul basic-negcoord-ref.xul
+!= blur.xul blur-notref.xul
+== color-inherit.xul color-inherit-ref.xul
+== multiple-noblur.xul multiple-noblur-ref.xul
 == blur-opacity.html blur-opacity-ref.html
 
 == basic.html basic-ref.html
 == basic-negcoord.html basic-negcoord-ref.html
 == basic-opacity.html basic-opacity-ref.html
 != blur.html blur-notref.html
 == color-inherit.html color-inherit-ref.html
 == color-parserorder.html color-parserorder-ref.html
--- a/layout/reftests/xul-document-load/reftest.list
+++ b/layout/reftests/xul-document-load/reftest.list
@@ -1,9 +1,9 @@
-== chrome://reftest/content/xul-document-load/test003.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test004.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test005.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test006.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test008.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test010.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test012.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test013.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
-== chrome://reftest/content/xul-document-load/test022.xul chrome://reftest/content/xul-document-load/reference-green-window.xul
+== test003.xul reference-green-window.xul
+== test004.xul reference-green-window.xul
+== test005.xul reference-green-window.xul
+== test006.xul reference-green-window.xul
+== test008.xul reference-green-window.xul
+== test010.xul reference-green-window.xul
+== test012.xul reference-green-window.xul
+== test013.xul reference-green-window.xul
+== test022.xul reference-green-window.xul
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -1,95 +1,95 @@
-== chrome://reftest/content/xul/css-flex-1.xul css-flex-1-ref.html
+== css-flex-1.xul css-flex-1-ref.html
 
-== chrome://reftest/content/xul/menuitem-key.xul chrome://reftest/content/xul/menuitem-key-ref.xul
+== menuitem-key.xul menuitem-key-ref.xul
 # these random-if(Android) are due to differences between Android Native & Xul, see bug 732569
 random-if(Android) == chrome://reftest/content/xul/menulist-shrinkwrap-1.xul chrome://reftest/content/xul/menulist-shrinkwrap-1-ref.xul
 random-if(Android) == chrome://reftest/content/xul/menulist-shrinkwrap-2.xul chrome://reftest/content/xul/menulist-shrinkwrap-2-ref.xul
-== chrome://reftest/content/xul/textbox-overflow-1.xul chrome://reftest/content/xul/textbox-overflow-1-ref.xul # for bug 749658
+== textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658
 # accesskeys are not normally displayed on Mac, so set a pref to enable them
-pref(ui.key.menuAccessKey,18) == chrome://reftest/content/xul/accesskey.xul chrome://reftest/content/xul/accesskey-ref.xul
-pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == chrome://reftest/content/xul/tree-row-outline-1.xul chrome://reftest/content/xul/tree-row-outline-1-ref.xul # win8: bug 1254832
+pref(ui.key.menuAccessKey,18) == chrome://reftest/content/xul/accesskey.xul accesskey-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # win8: bug 1254832
 skip-if(!cocoaWidget) fails-if(webrender&&cocoaWidget) == chrome://reftest/content/xul/mac-tab-toolbar.xul chrome://reftest/content/xul/mac-tab-toolbar-ref.xul
-pref(layout.css.xul-tree-pseudos.content.enabled,true) != chrome://reftest/content/xul/tree-row-outline-1.xul chrome://reftest/content/xul/tree-row-outline-1-notref.xul
-== chrome://reftest/content/xul/text-crop.xul chrome://reftest/content/xul/text-crop-ref.xul
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xul chrome://reftest/content/xul/text-small-caps-1-ref.xul
-fuzzy-if(skiaContent,0-1,0-60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,0-1,0-31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,0-1,0-50) fuzzy-if(webrender,0-1,350-1050) == chrome://reftest/content/xul/inactive-fixed-bg-bug1205630.xul inactive-fixed-bg-bug1205630-ref.html
-fuzzy-if(skiaContent,0-1,0-60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,0-1,0-31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,0-1,0-50) fuzzy-if(webrender,0-1,450-1100) == chrome://reftest/content/xul/inactive-fixed-bg-bug1272525.xul inactive-fixed-bg-bug1272525-ref.html
+pref(layout.css.xul-tree-pseudos.content.enabled,true) != tree-row-outline-1.xul tree-row-outline-1-notref.xul
+== text-crop.xul text-crop-ref.xul
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.xul text-small-caps-1-ref.xul
+fuzzy-if(skiaContent,0-1,0-60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,0-1,0-31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,0-1,0-50) fuzzy-if(webrender,0-1,350-1050) == inactive-fixed-bg-bug1205630.xul inactive-fixed-bg-bug1205630-ref.html
+fuzzy-if(skiaContent,0-1,0-60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,0-1,0-31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,0-1,0-50) fuzzy-if(webrender,0-1,450-1100) == inactive-fixed-bg-bug1272525.xul inactive-fixed-bg-bug1272525-ref.html
 
 # Tests for XUL <image> with 'object-fit' & 'object-position':
 # These tests should be very similar to tests in our w3c-css/submitted/images3
 # reftest directory. They live here because they use XUL, and it
 # wouldn't be fair of us to make a W3C testsuite implicitly depend on XUL.
-== chrome://reftest/content/xul/object-fit-contain-png-001.xul object-fit-contain-png-001-ref.html
-== chrome://reftest/content/xul/object-fit-contain-png-002.xul object-fit-contain-png-002-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-001.xul object-fit-contain-svg-001-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-002.xul object-fit-contain-svg-002-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-003.xul object-fit-contain-svg-003-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-004.xul object-fit-contain-svg-004-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-005.xul object-fit-contain-svg-005-ref.html
-== chrome://reftest/content/xul/object-fit-contain-svg-006.xul object-fit-contain-svg-006-ref.html
-== chrome://reftest/content/xul/object-fit-cover-png-001.xul object-fit-cover-png-001-ref.html
-== chrome://reftest/content/xul/object-fit-cover-png-002.xul object-fit-cover-png-002-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-001.xul object-fit-cover-svg-001-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-002.xul object-fit-cover-svg-002-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-003.xul object-fit-cover-svg-003-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-004.xul object-fit-cover-svg-004-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-005.xul object-fit-cover-svg-005-ref.html
-== chrome://reftest/content/xul/object-fit-cover-svg-006.xul object-fit-cover-svg-006-ref.html
-== chrome://reftest/content/xul/object-fit-fill-png-001.xul object-fit-fill-png-001-ref.html
-== chrome://reftest/content/xul/object-fit-fill-png-002.xul object-fit-fill-png-002-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-001.xul object-fit-fill-svg-001-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-002.xul object-fit-fill-svg-002-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-003.xul object-fit-fill-svg-003-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-004.xul object-fit-fill-svg-004-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-005.xul object-fit-fill-svg-005-ref.html
-== chrome://reftest/content/xul/object-fit-fill-svg-006.xul object-fit-fill-svg-006-ref.html
-== chrome://reftest/content/xul/object-fit-none-png-001.xul object-fit-none-png-001-ref.html
-== chrome://reftest/content/xul/object-fit-none-png-002.xul object-fit-none-png-002-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-001.xul object-fit-none-svg-001-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-002.xul object-fit-none-svg-002-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-003.xul object-fit-none-svg-003-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-004.xul object-fit-none-svg-004-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-005.xul object-fit-none-svg-005-ref.html
-== chrome://reftest/content/xul/object-fit-none-svg-006.xul object-fit-none-svg-006-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-png-001.xul object-fit-scale-down-png-001-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-png-002.xul object-fit-scale-down-png-002-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-001.xul object-fit-scale-down-svg-001-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-002.xul object-fit-scale-down-svg-002-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-003.xul object-fit-scale-down-svg-003-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-004.xul object-fit-scale-down-svg-004-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-005.xul object-fit-scale-down-svg-005-ref.html
-== chrome://reftest/content/xul/object-fit-scale-down-svg-006.xul object-fit-scale-down-svg-006-ref.html
-== chrome://reftest/content/xul/object-position-png-001.xul object-position-png-001-ref.html
-== chrome://reftest/content/xul/object-position-png-002.xul object-position-png-002-ref.html
+== object-fit-contain-png-001.xul object-fit-contain-png-001-ref.html
+== object-fit-contain-png-002.xul object-fit-contain-png-002-ref.html
+== object-fit-contain-svg-001.xul object-fit-contain-svg-001-ref.html
+== object-fit-contain-svg-002.xul object-fit-contain-svg-002-ref.html
+== object-fit-contain-svg-003.xul object-fit-contain-svg-003-ref.html
+== object-fit-contain-svg-004.xul object-fit-contain-svg-004-ref.html
+== object-fit-contain-svg-005.xul object-fit-contain-svg-005-ref.html
+== object-fit-contain-svg-006.xul object-fit-contain-svg-006-ref.html
+== object-fit-cover-png-001.xul object-fit-cover-png-001-ref.html
+== object-fit-cover-png-002.xul object-fit-cover-png-002-ref.html
+== object-fit-cover-svg-001.xul object-fit-cover-svg-001-ref.html
+== object-fit-cover-svg-002.xul object-fit-cover-svg-002-ref.html
+== object-fit-cover-svg-003.xul object-fit-cover-svg-003-ref.html
+== object-fit-cover-svg-004.xul object-fit-cover-svg-004-ref.html
+== object-fit-cover-svg-005.xul object-fit-cover-svg-005-ref.html
+== object-fit-cover-svg-006.xul object-fit-cover-svg-006-ref.html
+== object-fit-fill-png-001.xul object-fit-fill-png-001-ref.html
+== object-fit-fill-png-002.xul object-fit-fill-png-002-ref.html
+== object-fit-fill-svg-001.xul object-fit-fill-svg-001-ref.html
+== object-fit-fill-svg-002.xul object-fit-fill-svg-002-ref.html
+== object-fit-fill-svg-003.xul object-fit-fill-svg-003-ref.html
+== object-fit-fill-svg-004.xul object-fit-fill-svg-004-ref.html
+== object-fit-fill-svg-005.xul object-fit-fill-svg-005-ref.html
+== object-fit-fill-svg-006.xul object-fit-fill-svg-006-ref.html
+== object-fit-none-png-001.xul object-fit-none-png-001-ref.html
+== object-fit-none-png-002.xul object-fit-none-png-002-ref.html
+== object-fit-none-svg-001.xul object-fit-none-svg-001-ref.html
+== object-fit-none-svg-002.xul object-fit-none-svg-002-ref.html
+== object-fit-none-svg-003.xul object-fit-none-svg-003-ref.html
+== object-fit-none-svg-004.xul object-fit-none-svg-004-ref.html
+== object-fit-none-svg-005.xul object-fit-none-svg-005-ref.html
+== object-fit-none-svg-006.xul object-fit-none-svg-006-ref.html
+== object-fit-scale-down-png-001.xul object-fit-scale-down-png-001-ref.html
+== object-fit-scale-down-png-002.xul object-fit-scale-down-png-002-ref.html
+== object-fit-scale-down-svg-001.xul object-fit-scale-down-svg-001-ref.html
+== object-fit-scale-down-svg-002.xul object-fit-scale-down-svg-002-ref.html
+== object-fit-scale-down-svg-003.xul object-fit-scale-down-svg-003-ref.html
+== object-fit-scale-down-svg-004.xul object-fit-scale-down-svg-004-ref.html
+== object-fit-scale-down-svg-005.xul object-fit-scale-down-svg-005-ref.html
+== object-fit-scale-down-svg-006.xul object-fit-scale-down-svg-006-ref.html
+== object-position-png-001.xul object-position-png-001-ref.html
+== object-position-png-002.xul object-position-png-002-ref.html
 
-== chrome://reftest/content/xul/stack-sizing-1.xul chrome://reftest/content/xul/stack-sizing-1-ref.xul
-== chrome://reftest/content/xul/stack-sizing-2.xul chrome://reftest/content/xul/stack-sizing-2-ref.xul
+== stack-sizing-1.xul stack-sizing-1-ref.xul
+== stack-sizing-2.xul stack-sizing-2-ref.xul
 
 # Tests for rendering SVG images in a XUL <treecell>:
 # XXXdholbert: These are marked as "random" right now, since they might not
 # render the images they trying to test in time for the reftest snapshot, per
 # bug 1218954.
-skip == chrome://reftest/content/xul/treecell-image-svg-1a.xul chrome://reftest/content/xul/treecell-image-svg-1-ref.xul # bug 1218954
-skip == chrome://reftest/content/xul/treecell-image-svg-1b.xul chrome://reftest/content/xul/treecell-image-svg-1-ref.xul # bug 1218954
+skip == treecell-image-svg-1a.xul treecell-image-svg-1-ref.xul # bug 1218954
+skip == treecell-image-svg-1b.xul treecell-image-svg-1-ref.xul # bug 1218954
 
-== chrome://reftest/content/xul/treechildren-padding-percent-1.xul chrome://reftest/content/xul/treechildren-padding-percent-1-ref.xul
+== treechildren-padding-percent-1.xul treechildren-padding-percent-1-ref.xul
 
-pref(layout.css.xul-tree-pseudos.content.enabled,true) != chrome://reftest/content/xul/treetwisty-svg-context-paint-1-not-ref.xul chrome://reftest/content/xul/treetwisty-svg-context-paint-1-ref.xul
-pref(layout.css.xul-tree-pseudos.content.enabled,true) test-pref(svg.context-properties.content.enabled,true) == chrome://reftest/content/xul/treetwisty-svg-context-paint-1.xul chrome://reftest/content/xul/treetwisty-svg-context-paint-1-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) != treetwisty-svg-context-paint-1-not-ref.xul treetwisty-svg-context-paint-1-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) test-pref(svg.context-properties.content.enabled,true) == treetwisty-svg-context-paint-1.xul treetwisty-svg-context-paint-1-ref.xul
 
 # resizer (non-native-themed)
 
-!= chrome://reftest/content/xul/resizer-bottomend.xul chrome://reftest/content/xul/blank-window.xul
-== chrome://reftest/content/xul/resizer-bottomend.xul chrome://reftest/content/xul/resizer-bottomright.xul
-!= chrome://reftest/content/xul/resizer-bottomend.xul chrome://reftest/content/xul/resizer-bottomend-rtl.xul
-!= chrome://reftest/content/xul/resizer-bottomend-rtl.xul chrome://reftest/content/xul/blank-window.xul
-== chrome://reftest/content/xul/resizer-bottomend-rtl.xul chrome://reftest/content/xul/resizer-bottomend-flipped.xul
-== chrome://reftest/content/xul/resizer-bottomleft-rtl.xul chrome://reftest/content/xul/resizer-bottomleft.xul
-== chrome://reftest/content/xul/resizer-bottomright-rtl.xul chrome://reftest/content/xul/resizer-bottomright.xul
+!= resizer-bottomend.xul blank-window.xul
+== resizer-bottomend.xul resizer-bottomright.xul
+!= resizer-bottomend.xul resizer-bottomend-rtl.xul
+!= resizer-bottomend-rtl.xul blank-window.xul
+== resizer-bottomend-rtl.xul resizer-bottomend-flipped.xul
+== resizer-bottomleft-rtl.xul resizer-bottomleft.xul
+== resizer-bottomright-rtl.xul resizer-bottomright.xul
 
-!= chrome://reftest/content/xul/resizer-bottomstart.xul chrome://reftest/content/xul/blank-window.xul
-== chrome://reftest/content/xul/resizer-bottomstart.xul chrome://reftest/content/xul/resizer-bottomleft.xul
-== chrome://reftest/content/xul/resizer-bottomstart.xul chrome://reftest/content/xul/resizer-left.xul
-!= chrome://reftest/content/xul/resizer-bottomstart.xul chrome://reftest/content/xul/resizer-bottomstart-rtl.xul
-!= chrome://reftest/content/xul/resizer-bottomstart-rtl.xul chrome://reftest/content/xul/blank-window.xul
-== chrome://reftest/content/xul/resizer-bottomstart-rtl.xul chrome://reftest/content/xul/resizer-bottomend.xul
+!= resizer-bottomstart.xul blank-window.xul
+== resizer-bottomstart.xul resizer-bottomleft.xul
+== resizer-bottomstart.xul resizer-left.xul
+!= resizer-bottomstart.xul resizer-bottomstart-rtl.xul
+!= resizer-bottomstart-rtl.xul blank-window.xul
+== resizer-bottomstart-rtl.xul resizer-bottomend.xul
--- a/layout/tools/reftest/jar.mn
+++ b/layout/tools/reftest/jar.mn
@@ -1,34 +1,12 @@
 reftest.jar:
-# Ref tests
   content/moz-bool-pref.css (../../../layout/reftests/css-parsing/moz-bool-pref.css)
-  content/editor/reftests/xul (../../../editor/reftests/xul/*)
-  content/bidi (../../reftests/bidi/*)
-  content/box-ordinal (../../reftests/box-ordinal/*)
-  content/box-shadow (../../reftests/box-shadow/*)
-  content/bugs (../../reftests/bugs/*)
-  content/css-display (../../reftests/css-display/*)
-  content/forms/input/file (../../reftests/forms/input/file/*)
-  content/forms/input/text (../../reftests/forms/input/text/*)
-  content/forms/placeholder (../../reftests/forms/placeholder/*)
-  content/forms/textbox (../../reftests/forms/textbox/*)
-  content/image-region (../../reftests/image-region/*)
-  content/invalidation (../../reftests/invalidation/*)
-  content/native-theme (../../reftests/native-theme/*)
-  content/reftest-sanity (../../reftests/reftest-sanity/*)
-  content/text-shadow (../../reftests/text-shadow/*)
-  content/xul-document-load (../../reftests/xul-document-load/*)
+  content/osx-theme (../../../toolkit/themes/osx/reftests/*)
   content/xul (../../reftests/xul/*)
-  content/grid (../../xul/grid/reftests/*)
-  content/xul/reftest (../../xul/reftest/*)
-  content/fonts/fira (../../reftests/fonts/fira/*)
-  content/fonts/sil (../../reftests/fonts/sil/*)
-  content/toolkit/reftests (../../../toolkit/content/tests/reftests/*)
-  content/osx-theme (../../../toolkit/themes/osx/reftests/*)
   content/reftest.xul (reftest.xul)
 
   res/globals.jsm (globals.jsm)
   res/reftest-content.js (reftest-content.js)
   res/AsyncSpellCheckTestHelper.jsm (../../../editor/AsyncSpellCheckTestHelper.jsm)
   res/httpd.jsm (../../../netwerk/test/httpserver/httpd.js)
   res/StructuredLog.jsm (../../../testing/modules/StructuredLog.jsm)
   res/PerTestCoverageUtils.jsm (../../../tools/code-coverage/PerTestCoverageUtils.jsm)
--- a/layout/xul/grid/reftests/reftest.list
+++ b/layout/xul/grid/reftests/reftest.list
@@ -1,18 +1,18 @@
-== chrome://reftest/content/grid/row-sizing-1.xul chrome://reftest/content/grid/row-sizing-1-ref.xul
-== chrome://reftest/content/grid/column-sizing-1.xul chrome://reftest/content/grid/column-sizing-1-ref.xul
-== chrome://reftest/content/grid/row-or-column-sizing-1.xul chrome://reftest/content/grid/row-or-column-sizing-2.xul
-== chrome://reftest/content/grid/row-or-column-sizing-1.xul chrome://reftest/content/grid/row-or-column-sizing-3.xul
-== chrome://reftest/content/grid/row-or-column-sizing-1.xul chrome://reftest/content/grid/row-or-column-sizing-4.xul
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/z-order-1.xul chrome://reftest/content/grid/z-order-1-ref.xul
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/z-order-2.xul chrome://reftest/content/grid/z-order-2-ref.xul
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/not-full-basic.xul not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-110000) == chrome://reftest/content/grid/not-full-grid-pack-align.xul not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-30000) == chrome://reftest/content/grid/not-full-row-group-align.xul not-full-row-group-align-ref.xhtml # does anyone want/need this behavior?
-fuzzy-if(skiaContent,0-1,0-10000) == chrome://reftest/content/grid/not-full-row-group-pack.xul not-full-row-group-pack-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-50000) == chrome://reftest/content/grid/not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/not-full-row-leaf-align.xul not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-50000) == chrome://reftest/content/grid/not-full-row-leaf-pack.xul not-full-row-leaf-pack-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-80000) == chrome://reftest/content/grid/not-full-row-leaf-direction.xul not-full-row-leaf-pack-ref.xhtml
-random-if(transparentScrollbars) fuzzy-if(OSX==1010,0-1,0-565) == chrome://reftest/content/grid/scrollable-columns.xul scrollable-columns-ref.xhtml # bug 650597
-fails == chrome://reftest/content/grid/scrollable-rows.xul scrollable-rows-ref.xhtml
-== chrome://reftest/content/grid/sizing-2d.xul chrome://reftest/content/grid/sizing-2d-ref.xul
+== row-sizing-1.xul row-sizing-1-ref.xul
+== column-sizing-1.xul column-sizing-1-ref.xul
+== row-or-column-sizing-1.xul row-or-column-sizing-2.xul
+== row-or-column-sizing-1.xul row-or-column-sizing-3.xul
+== row-or-column-sizing-1.xul row-or-column-sizing-4.xul
+fuzzy-if(skiaContent,0-1,0-60000) == z-order-1.xul z-order-1-ref.xul
+fuzzy-if(skiaContent,0-1,0-60000) == z-order-2.xul z-order-2-ref.xul
+fuzzy-if(skiaContent,0-1,0-60000) == not-full-basic.xul not-full-basic-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-110000) == not-full-grid-pack-align.xul not-full-basic-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-30000) == not-full-row-group-align.xul not-full-row-group-align-ref.xhtml # does anyone want/need this behavior?
+fuzzy-if(skiaContent,0-1,0-10000) == not-full-row-group-pack.xul not-full-row-group-pack-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-50000) == not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-60000) == not-full-row-leaf-align.xul not-full-basic-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-50000) == not-full-row-leaf-pack.xul not-full-row-leaf-pack-ref.xhtml
+fuzzy-if(skiaContent,0-1,0-80000) == not-full-row-leaf-direction.xul not-full-row-leaf-pack-ref.xhtml
+random-if(transparentScrollbars) fuzzy-if(OSX==1010,0-1,0-565) == scrollable-columns.xul scrollable-columns-ref.xhtml # bug 650597
+fails == scrollable-rows.xul scrollable-rows-ref.xhtml
+== sizing-2d.xul sizing-2d-ref.xul
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@@ -1,7 +1,7 @@
-== chrome://reftest/content/xul/reftest/popup-explicit-size.xul chrome://reftest/content/xul/reftest/popup-explicit-size-ref.xul
-fuzzy-if(skiaContent,0-16,0-128) random-if(Android) == chrome://reftest/content/xul/reftest/image-size.xul chrome://reftest/content/xul/reftest/image-size-ref.xul
-== chrome://reftest/content/xul/reftest/image-scaling-min-height-1.xul chrome://reftest/content/xul/reftest/image-scaling-min-height-1-ref.xul
-== chrome://reftest/content/xul/reftest/textbox-text-transform.xul chrome://reftest/content/xul/reftest/textbox-text-transform-ref.xul
+== popup-explicit-size.xul popup-explicit-size-ref.xul
+fuzzy-if(skiaContent,0-16,0-128) random-if(Android) == image-size.xul image-size-ref.xul
+== image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
+== textbox-text-transform.xul textbox-text-transform-ref.xul
 
-== chrome://reftest/content/xul/reftest/checkbox-dynamic-change.xul chrome://reftest/content/xul/reftest/checkbox-dynamic-change-ref.xul
-== chrome://reftest/content/xul/reftest/radio-dynamic-change.xul chrome://reftest/content/xul/reftest/radio-dynamic-change-ref.xul
+== checkbox-dynamic-change.xul checkbox-dynamic-change-ref.xul
+== radio-dynamic-change.xul radio-dynamic-change-ref.xul
--- a/toolkit/content/tests/reftests/reftest.list
+++ b/toolkit/content/tests/reftests/reftest.list
@@ -1,5 +1,5 @@
-!= chrome://reftest/content/toolkit/reftests/textbox-multiline-default-value.xul chrome://reftest/content/toolkit/reftests/textbox-multiline-empty.xul
+!= textbox-multiline-default-value.xul textbox-multiline-empty.xul
 == videocontrols-dynamically-add-cc.html videocontrols-dynamically-add-cc-ref.html
 == audio-with-bogus-url.html audio-with-bogus-url-ref.html
 == audio-dynamically-change-small-width.html audio-dynamically-change-small-width-ref.html
 == audio-with-padding.html audio-with-padding-ref.html