From f916dc68ff89c8204724e9c593c6661ff9af1864 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Mon, 12 Mar 2018 16:08:36 +0900
Subject: [PATCH] Bug 1382841 - Remove old test_XXX openers that just set the
 dom.animations-api.core.enabled pref from layout/style/test**; r=hiro

As with an earlier patch in this series, we rename the file_* test content files
to test_*_to_rename.html in this patch, and then in a subsequent patch drop the
_to_rename suffix so that we can trace the history of the test_* files back to
their file_* equivalents.

MozReview-Commit-ID: Jes8xSQzkCF

--HG--
rename : layout/style/test/file_animations_effect_timing_duration.html => layout/style/test/test_animations_effect_timing_duration_to_rename.html
rename : layout/style/test/file_animations_effect_timing_enddelay.html => layout/style/test/test_animations_effect_timing_enddelay_to_rename.html
rename : layout/style/test/file_animations_effect_timing_iterations.html => layout/style/test/test_animations_effect_timing_iterations_to_rename.html
rename : layout/style/test/file_animations_iterationstart.html => layout/style/test/test_animations_iterationstart_to_rename.html
rename : layout/style/test/file_animations_pausing.html => layout/style/test/test_animations_pausing_to_rename.html
rename : layout/style/test/file_animations_playbackrate.html => layout/style/test/test_animations_playbackrate_to_rename.html
rename : layout/style/test/file_animations_reverse.html => layout/style/test/test_animations_reverse_to_rename.html
rename : layout/style/test/file_animations_styles_on_event.html => layout/style/test/test_animations_styles_on_event_to_rename.html
rename : layout/style/test/file_transitions_replacement_on_busy_frame.html => layout/style/test/test_transitions_replacement_on_busy_frame_to_rename.html
---
 layout/style/test/mochitest.ini               | 29 +++++++-----------
 ...est_animations_effect_timing_duration.html | 24 ---------------
 ...ons_effect_timing_duration_to_rename.html} | 24 +++++++--------
 ...est_animations_effect_timing_enddelay.html | 24 ---------------
 ...ons_effect_timing_enddelay_to_rename.html} | 22 +++++---------
 ...t_animations_effect_timing_iterations.html | 24 ---------------
 ...s_effect_timing_iterations_to_rename.html} | 24 +++++++--------
 .../test/test_animations_iterationstart.html  | 28 -----------------
 ..._animations_iterationstart_to_rename.html} | 25 +++++++---------
 .../style/test/test_animations_pausing.html   | 28 -----------------
 ...=> test_animations_pausing_to_rename.html} | 24 +++++++--------
 .../test/test_animations_playbackrate.html    | 28 -----------------
 ...st_animations_playbackrate_to_rename.html} | 22 +++++---------
 .../style/test/test_animations_reverse.html   | 30 -------------------
 ...=> test_animations_reverse_to_rename.html} | 22 +++++---------
 .../test/test_animations_styles_on_event.html | 28 -----------------
 ...animations_styles_on_event_to_rename.html} | 21 +++++++------
 ...t_animations_with_disabled_properties.html |  3 +-
 ...transitions_replacement_on_busy_frame.html | 30 -------------------
 ..._replacement_on_busy_frame_to_rename.html} | 19 +++++-------
 ..._transitions_with_disabled_properties.html |  3 +-
 21 files changed, 95 insertions(+), 387 deletions(-)
 delete mode 100644 layout/style/test/test_animations_effect_timing_duration.html
 rename layout/style/test/{file_animations_effect_timing_duration.html => test_animations_effect_timing_duration_to_rename.html} (84%)
 delete mode 100644 layout/style/test/test_animations_effect_timing_enddelay.html
 rename layout/style/test/{file_animations_effect_timing_enddelay.html => test_animations_effect_timing_enddelay_to_rename.html} (91%)
 delete mode 100644 layout/style/test/test_animations_effect_timing_iterations.html
 rename layout/style/test/{file_animations_effect_timing_iterations.html => test_animations_effect_timing_iterations_to_rename.html} (79%)
 delete mode 100644 layout/style/test/test_animations_iterationstart.html
 rename layout/style/test/{file_animations_iterationstart.html => test_animations_iterationstart_to_rename.html} (75%)
 delete mode 100644 layout/style/test/test_animations_pausing.html
 rename layout/style/test/{file_animations_pausing.html => test_animations_pausing_to_rename.html} (85%)
 delete mode 100644 layout/style/test/test_animations_playbackrate.html
 rename layout/style/test/{file_animations_playbackrate.html => test_animations_playbackrate_to_rename.html} (86%)
 delete mode 100644 layout/style/test/test_animations_reverse.html
 rename layout/style/test/{file_animations_reverse.html => test_animations_reverse_to_rename.html} (82%)
 delete mode 100644 layout/style/test/test_animations_styles_on_event.html
 rename layout/style/test/{file_animations_styles_on_event.html => test_animations_styles_on_event_to_rename.html} (83%)
 delete mode 100644 layout/style/test/test_transitions_replacement_on_busy_frame.html
 rename layout/style/test/{file_transitions_replacement_on_busy_frame.html => test_transitions_replacement_on_busy_frame_to_rename.html} (89%)

diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini
index 66957e08d5ba..560e23c3a0ff 100644
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -1,4 +1,6 @@
 [DEFAULT]
+prefs =
+  dom.animations-api.core.enabled=true
 support-files =
   animation_utils.js
   ccd-quirks.html
@@ -49,35 +51,27 @@ skip-if = (toolkit == 'android')
 [test_animations_async_tests.html]
 support-files = Ahem.ttf file_animations_async_tests.html
 [test_animations_dynamic_changes.html]
-[test_animations_effect_timing_duration.html]
-support-files = file_animations_effect_timing_duration.html
+[test_animations_effect_timing_duration_to_rename.html]
 skip-if = webrender # bug 1424752
-[test_animations_effect_timing_enddelay.html]
-support-files = file_animations_effect_timing_enddelay.html
+[test_animations_effect_timing_enddelay_to_rename.html]
 skip-if = webrender # bug 1424752
-[test_animations_effect_timing_iterations.html]
-support-files = file_animations_effect_timing_iterations.html
+[test_animations_effect_timing_iterations_to_rename.html]
 skip-if = webrender # bug 1424752
 [test_animations_event_order.html]
 [test_animations_event_handler_attribute.html]
-[test_animations_iterationstart.html]
-support-files = file_animations_iterationstart.html
+[test_animations_iterationstart_to_rename.html]
 skip-if = webrender # bug 1424752
 [test_animations_omta.html]
 skip-if = webrender # bug 1424752
 [test_animations_omta_start.html]
 skip-if = webrender # bug 1424752
-[test_animations_pausing.html]
-support-files = file_animations_pausing.html
+[test_animations_pausing_to_rename.html]
 skip-if = webrender # bug 1424752
-[test_animations_playbackrate.html]
-support-files = file_animations_playbackrate.html
+[test_animations_playbackrate_to_rename.html]
 skip-if = webrender # bug 1424752
-[test_animations_reverse.html]
-support-files = file_animations_reverse.html
+[test_animations_reverse_to_rename.html]
 skip-if = webrender # bug 1424752
-[test_animations_styles_on_event.html]
-support-files = file_animations_styles_on_event.html
+[test_animations_styles_on_event_to_rename.html]
 [test_animations_variable_changes.html]
 [test_animations_with_disabled_properties.html]
 support-files = file_animations_with_disabled_properties.html
@@ -334,8 +328,7 @@ skip-if = (android_version == '18' && debug) # bug 1159532
 [test_transitions_dynamic_changes.html]
 [test_transitions_per_property.html]
 skip-if = (toolkit == 'android') || webrender # bug 775227 for android, bug 1424752 for webrender
-[test_transitions_replacement_on_busy_frame.html]
-support-files = file_transitions_replacement_on_busy_frame.html
+[test_transitions_replacement_on_busy_frame_to_rename.html]
 [test_transitions_step_functions.html]
 [test_transitions_with_disabled_properties.html]
 support-files = file_transitions_with_disabled_properties.html
diff --git a/layout/style/test/test_animations_effect_timing_duration.html b/layout/style/test/test_animations_effect_timing_duration.html
deleted file mode 100644
index 30d77f20a529..000000000000
--- a/layout/style/test/test_animations_effect_timing_duration.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for animation.effect.timing on compositor</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_effect_timing_duration.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_effect_timing_duration.html b/layout/style/test/test_animations_effect_timing_duration_to_rename.html
similarity index 84%
rename from layout/style/test/file_animations_effect_timing_duration.html
rename to layout/style/test/test_animations_effect_timing_duration_to_rename.html
index e8a224aed887..ede770d399e0 100644
--- a/layout/style/test/file_animations_effect_timing_duration.html
+++ b/layout/style/test/test_animations_effect_timing_duration_to_rename.html
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>
+    Test for Animation.effect.timing.duration on compositor animations
+  </title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translate(0px) }
@@ -16,27 +22,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div ] = new_div("");
diff --git a/layout/style/test/test_animations_effect_timing_enddelay.html b/layout/style/test/test_animations_effect_timing_enddelay.html
deleted file mode 100644
index d4ad918dda0d..000000000000
--- a/layout/style/test/test_animations_effect_timing_enddelay.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for animation.effect.timing.endDelay on compositor</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_effect_timing_enddelay.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_effect_timing_enddelay.html b/layout/style/test/test_animations_effect_timing_enddelay_to_rename.html
similarity index 91%
rename from layout/style/test/file_animations_effect_timing_enddelay.html
rename to layout/style/test/test_animations_effect_timing_enddelay_to_rename.html
index e0b025e3f395..997d77f68c36 100644
--- a/layout/style/test/file_animations_effect_timing_enddelay.html
+++ b/layout/style/test/test_animations_effect_timing_enddelay_to_rename.html
@@ -1,9 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>Test for Animation.effect.endDelay on compositor animations</title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     .target {
       /* The animation target needs geometry in order to qualify for OMTA */
@@ -12,27 +16,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div ] = new_div("");
diff --git a/layout/style/test/test_animations_effect_timing_iterations.html b/layout/style/test/test_animations_effect_timing_iterations.html
deleted file mode 100644
index 625c52867cf6..000000000000
--- a/layout/style/test/test_animations_effect_timing_iterations.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for animation.effect.timing.iterations on compositor</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_effect_timing_iterations.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_effect_timing_iterations.html b/layout/style/test/test_animations_effect_timing_iterations_to_rename.html
similarity index 79%
rename from layout/style/test/file_animations_effect_timing_iterations.html
rename to layout/style/test/test_animations_effect_timing_iterations_to_rename.html
index da3c04851a38..c11ac740b21f 100644
--- a/layout/style/test/file_animations_effect_timing_iterations.html
+++ b/layout/style/test/test_animations_effect_timing_iterations_to_rename.html
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>
+    Test for Animation.effect.timing.iterations on compositor animations
+  </title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translate(0px) }
@@ -16,27 +22,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div ] = new_div("");
diff --git a/layout/style/test/test_animations_iterationstart.html b/layout/style/test/test_animations_iterationstart.html
deleted file mode 100644
index d6a54f3b2583..000000000000
--- a/layout/style/test/test_animations_iterationstart.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1248338
--->
-<head>
-  <title>Test for iterationStart on compositor animations (Bug 1248338)</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1248338">Mozilla Bug 1248338</a>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_iterationstart.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_iterationstart.html b/layout/style/test/test_animations_iterationstart_to_rename.html
similarity index 75%
rename from layout/style/test/file_animations_iterationstart.html
rename to layout/style/test/test_animations_iterationstart_to_rename.html
index 5d752b858193..8f80b51dd7dc 100644
--- a/layout/style/test/file_animations_iterationstart.html
+++ b/layout/style/test/test_animations_iterationstart_to_rename.html
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>
+    Test for Animation.effect.timing.iterationStart on compositor animations
+  </title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     .target {
       /* The animation target needs geometry in order to qualify for OMTA */
@@ -12,28 +18,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
-runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+SimpleTest.waitForExplicitFinish();
 
+runOMTATest(function() {
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div ] = new_div("test");
diff --git a/layout/style/test/test_animations_pausing.html b/layout/style/test/test_animations_pausing.html
deleted file mode 100644
index 65dee5b297ac..000000000000
--- a/layout/style/test/test_animations_pausing.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1070745
--->
-<head>
-  <title>Test for play() and pause() on animations (Bug 1070745)</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1070745">Mozilla Bug 1070745</a>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_pausing.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_pausing.html b/layout/style/test/test_animations_pausing_to_rename.html
similarity index 85%
rename from layout/style/test/file_animations_pausing.html
rename to layout/style/test/test_animations_pausing_to_rename.html
index 8ecf2625d884..529ee8a4e6eb 100644
--- a/layout/style/test/file_animations_pausing.html
+++ b/layout/style/test/test_animations_pausing_to_rename.html
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>
+    Test for Animation.play() and Animation.pause() on compositor animations
+  </title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translate(0px) }
@@ -16,27 +22,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div, cs ] = new_div("animation: anim 10s 2 linear alternate");
diff --git a/layout/style/test/test_animations_playbackrate.html b/layout/style/test/test_animations_playbackrate.html
deleted file mode 100644
index 16deca02c1f6..000000000000
--- a/layout/style/test/test_animations_playbackrate.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1175751
--->
-<head>
-  <title>Test for Animation.playbackRate on compositor animations (Bug 1175751)</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1175751">Mozilla Bug 1175751</a>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_playbackrate.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_playbackrate.html b/layout/style/test/test_animations_playbackrate_to_rename.html
similarity index 86%
rename from layout/style/test/file_animations_playbackrate.html
rename to layout/style/test/test_animations_playbackrate_to_rename.html
index 5ff4f0e3f9b4..db78f4be08a4 100644
--- a/layout/style/test/file_animations_playbackrate.html
+++ b/layout/style/test/test_animations_playbackrate_to_rename.html
@@ -1,9 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>Test for Animation.playbackRate on compositor animations</title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translate(0px) }
@@ -16,27 +20,17 @@
       background-color: white;
     }
   </style>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div, cs ] = new_div("animation: anim 10s 1 linear forwards");
diff --git a/layout/style/test/test_animations_reverse.html b/layout/style/test/test_animations_reverse.html
deleted file mode 100644
index 513d680b1e85..000000000000
--- a/layout/style/test/test_animations_reverse.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1343589
--->
-<head>
-  <meta charset=utf-8>
-  <title>Test for Animation.reverse() on compositor animations (Bug 1343589)</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank"
-  href="https://bugzilla.mozilla.org/show_bug.cgi?id=1343589">Mozilla Bug 1343589</a>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_reverse.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_reverse.html b/layout/style/test/test_animations_reverse_to_rename.html
similarity index 82%
rename from layout/style/test/file_animations_reverse.html
rename to layout/style/test/test_animations_reverse_to_rename.html
index 304b399e0642..a2ec8445bda6 100644
--- a/layout/style/test/file_animations_reverse.html
+++ b/layout/style/test/test_animations_reverse_to_rename.html
@@ -2,19 +2,13 @@
 <html>
 <head>
   <meta charset=utf-8>
+  <title>Test for Animation.reverse() on compositor animations</title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript" src="animation_utils.js"></script>
-  <script>
-    var ok = opener.ok.bind(opener);
-    var is = opener.is.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translate(0px) }
@@ -33,11 +27,11 @@
 <script type="application/javascript">
 "use strict";
 
+SimpleTest.waitForExplicitFinish();
+
 runOMTATest(function() {
-  runAllAsyncAnimTests().then(function() {
-    finish();
-  });
-}, finish, opener.SpecialPowers);
+  runAllAsyncAnimTests().then(SimpleTest.finish);
+}, SimpleTest.finish, SpecialPowers);
 
 addAsyncAnimTest(async function() {
   var [ div, cs ] = new_div("animation: anim 10s linear");
diff --git a/layout/style/test/test_animations_styles_on_event.html b/layout/style/test/test_animations_styles_on_event.html
deleted file mode 100644
index da7680727de1..000000000000
--- a/layout/style/test/test_animations_styles_on_event.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1228137
--->
-<head>
-  <title>Test that mouse movement immediately after finish() should involve restyling for finished state(Bug 1228137)</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1219236">Mozilla Bug 1228137</a>
-<div id="display"></div>
-<pre id="test">
-<script type="application/javascript">
-"use strict";
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { "set": [[ "dom.animations-api.core.enabled", true]] },
-  function() {
-    window.open("file_animations_styles_on_event.html");
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_animations_styles_on_event.html b/layout/style/test/test_animations_styles_on_event_to_rename.html
similarity index 83%
rename from layout/style/test/file_animations_styles_on_event.html
rename to layout/style/test/test_animations_styles_on_event_to_rename.html
index 023e8eaaba83..47d3323466ec 100644
--- a/layout/style/test/file_animations_styles_on_event.html
+++ b/layout/style/test/test_animations_styles_on_event_to_rename.html
@@ -1,12 +1,19 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <title>
+    Test that mouse movement immediately after finish() should involve
+    restyling for finished state (Bug 1228137)
+  </title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript"
     src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style type="text/css">
     @keyframes anim {
       0% { transform: translateX(0px) }
@@ -19,20 +26,12 @@
       background-color: white;
     }
   </style>
-  <script>
-    var is = opener.is.bind(opener);
-    var ok = opener.ok.bind(opener);
-    var todo = opener.todo.bind(opener);
-    function finish() {
-      var o = opener;
-      self.close();
-      o.SimpleTest.finish();
-    }
-  </script>
 </head>
 <body>
 <div id="display"></div>
 <script type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+
 window.onload = function () {
   // To avoid the effect that newly created element's styles are
   // not updated immediately, we need to add an element without
@@ -51,7 +50,7 @@ window.onload = function () {
          "The target of the animation should receive the mouse move event " +
          "on the position of the animation's effect end.");
       done_div();
-      finish();
+      SimpleTest.finish();
     });
 
     var animation = div.getAnimations()[0];
diff --git a/layout/style/test/test_animations_with_disabled_properties.html b/layout/style/test/test_animations_with_disabled_properties.html
index 2ac6311692fb..f2aac8e78b98 100644
--- a/layout/style/test/test_animations_with_disabled_properties.html
+++ b/layout/style/test/test_animations_with_disabled_properties.html
@@ -25,8 +25,7 @@ SimpleTest.waitForExplicitFinish();
  * pref we will need to substitute some other pref:property combination.
  */
 SpecialPowers.pushPrefEnv(
-  { 'set': [[ 'dom.animations-api.core.enabled', true ],
-            [ 'layout.css.prefixes.webkit', false ]] },
+  { 'set': [[ 'layout.css.prefixes.webkit', false ]] },
   () => window.open('file_animations_with_disabled_properties.html'));
 </script>
 </pre>
diff --git a/layout/style/test/test_transitions_replacement_on_busy_frame.html b/layout/style/test/test_transitions_replacement_on_busy_frame.html
deleted file mode 100644
index a9e197d160ee..000000000000
--- a/layout/style/test/test_transitions_replacement_on_busy_frame.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1167519
--->
-<head>
-  <title>Test for bug 1167519</title>
-  <script type="application/javascript"
-    src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank"
-  href="https://bugzilla.mozilla.org/show_bug.cgi?id=1167519">Mozilla Bug
-  1167519</a>
-<pre id="test">
-<script>
-'use strict';
-
-SimpleTest.waitForExplicitFinish();
-
-SpecialPowers.pushPrefEnv(
-  { 'set': [[ 'dom.animations-api.core.enabled', true ]] },
-  function() {
-    window.open('file_transitions_replacement_on_busy_frame.html');
-  });
-</script>
-</pre>
-</body>
-</html>
diff --git a/layout/style/test/file_transitions_replacement_on_busy_frame.html b/layout/style/test/test_transitions_replacement_on_busy_frame_to_rename.html
similarity index 89%
rename from layout/style/test/file_transitions_replacement_on_busy_frame.html
rename to layout/style/test/test_transitions_replacement_on_busy_frame_to_rename.html
index 21a05b3f0978..75d679a6fdea 100644
--- a/layout/style/test/file_transitions_replacement_on_busy_frame.html
+++ b/layout/style/test/test_transitions_replacement_on_busy_frame_to_rename.html
@@ -5,9 +5,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1167519
 -->
 <head>
   <meta charset=utf-8>
+  <title>Test for bug 1167519</title>
+  <script type="application/javascript"
+    src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript"
     src="/tests/SimpleTest/paint_listener.js"></script>
   <script src="animation_utils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
   <style>
     #target {
       height: 100px;
@@ -22,22 +26,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1167519
 <script>
 'use strict';
 
-var ok = opener.ok.bind(opener);
-var isnot = opener.isnot.bind(opener);
-
-function finish() {
-  var o = opener;
-  self.close();
-  o.SimpleTest.finish();
-}
+SimpleTest.waitForExplicitFinish();
 
 var OMTAPrefKey = "layers.offmainthreadcomposition.async-animations";
 var omtaEnabled = SpecialPowers.DOMWindowUtils.layerManagerRemote &&
-                  opener.SpecialPowers.getBoolPref(OMTAPrefKey);
+                  SpecialPowers.getBoolPref(OMTAPrefKey);
 window.addEventListener("load", function() {
   if (!omtaEnabled) {
     ok(true, "Skipping the test since OMTA is disabled");
-    finish();
+    SimpleTest.finish();
     return;
   }
 
@@ -89,7 +86,7 @@ window.addEventListener("load", function() {
               previousKeyframeValue,
               "Keyframe value of transition is updated since the moment when " +
               "it was generated");
-        finish();
+        SimpleTest.finish();
       });
     });
   });
diff --git a/layout/style/test/test_transitions_with_disabled_properties.html b/layout/style/test/test_transitions_with_disabled_properties.html
index fc0965f428fd..32641e36c815 100644
--- a/layout/style/test/test_transitions_with_disabled_properties.html
+++ b/layout/style/test/test_transitions_with_disabled_properties.html
@@ -19,8 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1265611
 <script>
 SimpleTest.waitForExplicitFinish();
 
-SpecialPowers.pushPrefEnv({'set': [['layout.css.prefixes.webkit', false],
-                                   ['dom.animations-api.core.enabled', true]] },
+SpecialPowers.pushPrefEnv({'set': [['layout.css.prefixes.webkit', false]] },
   () => window.open('file_transitions_with_disabled_properties.html'));
 </script>
 </pre>