Merge autoland to m-c, a=merge
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 26 Feb 2017 10:23:10 -0800
changeset 373988 aa2b14b08dbb728ab6b9868e43a66842626f1833
parent 373965 c75ce3362c05d005c4b00d69de9b2ad177b648ed (current diff)
parent 373987 7c76324244b436372227db5099183d2c84cd32c2 (diff)
child 374000 7ef1e9abd296a8edc39b7efc8d637767ba2f77ed
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone54.0a1
Merge autoland to m-c, a=merge
third_party/rust/syn/src/helper.rs
third_party/rust/syn/src/macro_input.rs
third_party/rust/syn/src/nom.rs
third_party/rust/syn/src/registry.rs
third_party/rust/syn/src/space.rs
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -14,57 +14,63 @@
 ^gfx/2d/image_operations.*
 ^gfx/angle/.*
 ^gfx/cairo/.*
 ^gfx/graphite2/.*
 ^gfx/harfbuzz/.*
 ^gfx/ots/.*
 ^gfx/qcms/.*
 ^gfx/skia/.*
+^gfx/webrender.*
+^gfx/webrender_traits.*
 ^gfx/ycbcr/.*
 ^intl/hyphenation/hyphen/.*
 ^intl/icu/.*
 ^ipc/chromium/.*
 ^js/src/ctypes/libffi/.*
 ^js/src/dtoa.c.*
 ^js/src/jit/arm64/vixl/.*
 ^media/gmp-clearkey/0.1/openaes/.*
 ^media/kiss_fft/.*
+^media/ffvpx/.*
 ^media/libav/.*
 ^media/libcubeb/.*
 ^media/libjpeg/.*
 ^media/libmkv/.*
 ^media/libnestegg/.*
 ^media/libogg/.*
 ^media/libopus/.*
 ^media/libpng/.*
 ^media/libsoundtouch/.*
 ^media/libspeex_resampler/.*
 ^media/libstagefright/.*
 ^media/libtheora/.*
 ^media/libtremor/.*
 ^media/libvorbis/.*
 ^media/libvpx/.*
 ^media/libyuv/.*
-^media/mtransport/.*
+^media/mtransport/third_party/.*
 ^media/openmax_dl/.*
 ^media/pocketsphinx/.*
 ^media/sphinxbase/.*
 ^media/webrtc/trunk/.*
+^media/webrtc/signaling/src/sdp/sipcc/.*
 ^memory/jemalloc/src/.*
 ^mfbt/decimal/.*
 ^mfbt/double-conversion/source/.*
 ^mfbt/lz4.*
 ^mobile/android/thirdparty/.*
 ^modules/brotli/.*
+^modules/fdlibm/.*
 ^modules/freetype2/.*
 ^modules/libbz2/.*
 ^modules/libmar/.*
 ^modules/zlib/.*
 ^netwerk/sctp/src/.*
 ^netwerk/srtp/src/.*
 ^nsprpub/.*
 ^other-licenses/.*
+^parser/expat/.*
 ^security/sandbox/chromium/.*
 ^testing/gtest/gmock/.*
 ^testing/gtest/gtest/.*
 ^toolkit/components/protobuf/.*
 ^toolkit/crashreporter/google-breakpad/.*
--- a/.eslintignore
+++ b/.eslintignore
@@ -79,43 +79,71 @@ browser/extensions/mortar/**
 # devtools/ exclusions
 devtools/client/canvasdebugger/**
 devtools/client/commandline/**
 devtools/client/debugger/**
 devtools/client/framework/**
 !devtools/client/framework/selection.js
 !devtools/client/framework/target*
 !devtools/client/framework/toolbox*
+devtools/client/inspector/markup/test/doc_markup_events_*.html
+devtools/client/inspector/rules/test/doc_media_queries.html
+devtools/client/memory/test/chrome/*.html
 devtools/client/netmonitor/test/**
 devtools/client/netmonitor/har/test/**
+devtools/client/performance/components/test/test_jit_optimizations_01.html
 devtools/client/projecteditor/**
+devtools/client/responsive.html/test/browser/touch.html
 devtools/client/responsivedesign/**
 devtools/client/scratchpad/**
 devtools/client/shadereditor/**
 devtools/client/shared/*.jsm
 devtools/client/shared/components/reps/reps.js
+devtools/client/shared/components/reps/test/mochitest/*.html
+!devtools/client/shared/components/reps/test/mochitest/test_reps_infinity.html
+!devtools/client/shared/components/reps/test/mochitest/test_reps_nan.html
+!devtools/client/shared/components/reps/test/mochitest/test_reps_promise.html
+!devtools/client/shared/components/reps/test/mochitest/test_reps_symbol.html
+!devtools/client/shared/components/reps/test/mochitest/test_reps_text-node.html
+devtools/client/shared/components/test/mochitest/*.html
+!devtools/client/shared/components/test/mochitest/test_stack-trace.html
+devtools/client/shared/shim/test/test_*.html
+devtools/client/shared/test/browser_toolbar_webconsole_errors_count.html
 devtools/client/shared/webgl-utils.js
 devtools/client/shared/widgets/*.jsm
+devtools/client/storage/test/*.html
+!devtools/client/storage/test/storage-cookies.html
+!devtools/client/storage/test/storage-overflow.html
+!devtools/client/storage/test/storage-search.html
+!devtools/client/storage/test/storage-unsecured-iframe.html
+!devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
 devtools/client/webaudioeditor/**
 devtools/client/webconsole/net/**
 devtools/client/webconsole/test/**
 devtools/client/webconsole/console-output.js
 devtools/client/webconsole/hudservice.js
 devtools/client/webconsole/webconsole-connection-proxy.js
 devtools/client/webconsole/webconsole.js
 devtools/client/webide/**
 !devtools/client/webide/components/webideCli.js
 devtools/server/actors/webconsole.js
 devtools/server/actors/object.js
 devtools/server/actors/script.js
 devtools/server/actors/styleeditor.js
 devtools/server/actors/stylesheets.js
+devtools/server/tests/browser/storage-*.html
+!devtools/server/tests/browser/storage-unsecured-iframe.html
+devtools/server/tests/browser/stylesheets-nested-iframes.html
 devtools/server/tests/mochitest/**
 devtools/server/tests/unit/**
 devtools/shared/heapsnapshot/**
+devtools/shared/platform/content/test/test_clipboard.html
+devtools/shared/qrcode/tests/mochitest/test_decode.html
+devtools/shared/tests/mochitest/*.html
+devtools/shared/webconsole/test/test_*.html
 
 # Ignore devtools pre-processed files
 devtools/client/framework/toolbox-process-window.js
 devtools/client/performance/system.js
 devtools/client/webide/webide-prefs.js
 devtools/client/preferences/**
 
 # Ignore devtools third-party libs
--- a/b2g/chrome/content/shell.html
+++ b/b2g/chrome/content/shell.html
@@ -17,37 +17,37 @@
       >
 
 <head>
   <link rel="stylesheet" href="shell.css" type="text/css">
   <script type="text/javascript">
   <!-- Add raptor performance marker -->
   window.performance.mark('gecko-shell-html-load');
   </script>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/settings.js"> </script>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/shell.js"> </script>
 
 #ifndef ANDROID
 #ifndef MOZ_GRAPHENE
   <!-- various task that has to happen only on desktop -->
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/desktop.js"> </script>
   <!-- this script handles the screen argument for desktop builds -->
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/screen.js"> </script>
 #endif
 #else
   <!-- this file is only loaded on Gonk to manage ADB state -->
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/devtools/adb.js"> </script>
 #endif
   <!-- manages DevTools server state -->
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/devtools/debugger.js"> </script>
 </head>
   <body id="container">
 #ifndef MOZ_GRAPHENE
 #ifdef MOZ_WIDGET_COCOA
     <!--
      If the document is empty at startup, we don't display the window
      at all on Mac OS...
--- a/b2g/chrome/content/shell_remote.html
+++ b/b2g/chrome/content/shell_remote.html
@@ -6,14 +6,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       id="shellRemote"
       windowtype="navigator:remote-browser"
       sizemode="fullscreen"
       >
 
 <head>
   <link rel="stylesheet" href="shell.css" type="text/css">
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://b2g/content/shell_remote.js"> </script>
 </head>
   <body id="container">
   </body>
 </html>
--- a/b2g/chrome/content/test/mochitest/file_getusermedia_iframe.html
+++ b/b2g/chrome/content/test/mochitest/file_getusermedia_iframe.html
@@ -1,20 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Iframe for Recording Status</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.7" src="RecordingStatusHelper.js"></script>
+  <script type="text/javascript" src="RecordingStatusHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 
 var localStream;
 
 window.addEventListener('message', function(event) {
   switch (event.data) {
     case 'start':
       let gumDeferred = expectStream({ audio: true,
                                        fake: true
--- a/b2g/chrome/content/test/mochitest/test_recordingStatus_basic.html
+++ b/b2g/chrome/content/test/mochitest/test_recordingStatus_basic.html
@@ -1,20 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Recording Status</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.7" src="RecordingStatusHelper.js"></script>
+  <script type="text/javascript" src="RecordingStatusHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 'use strict';
 
 SimpleTest.waitForExplicitFinish();
 
 function test() {
   let localStreams = [];
   TestInit().then(function(eventHelper) {
     /* step 1: create one audio stream
--- a/b2g/chrome/content/test/mochitest/test_recordingStatus_iframe.html
+++ b/b2g/chrome/content/test/mochitest/test_recordingStatus_iframe.html
@@ -1,21 +1,21 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Recording Status in iframe</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.7" src="RecordingStatusHelper.js"></script>
+  <script type="text/javascript" src="RecordingStatusHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
 <pre id="test">
 <iframe id="gum-iframe"></iframe>
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function test() {
   TestInit().then(function(eventHelper) {
     /* step 1: load iframe whilch creates audio stream
      * expect: see one mozChromeEvent for audio recording start.
      */
     let eventDeferred = expectEvent({ active: true,
--- a/b2g/chrome/content/test/mochitest/test_recordingStatus_kill_content_process.html
+++ b/b2g/chrome/content/test/mochitest/test_recordingStatus_kill_content_process.html
@@ -1,20 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Recording Status after process shutdown</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.7" src="RecordingStatusHelper.js"></script>
+  <script type="text/javascript" src="RecordingStatusHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function test() {
   let localStreams = [];
   TestInit().then(function(eventHelper) {
     /* step 1: load iframe whilch creates audio stream
      * expect: see one mozChromeEvent for audio recording start.
      */
--- a/b2g/chrome/content/test/mochitest/test_recordingStatus_multiple_requests.html
+++ b/b2g/chrome/content/test/mochitest/test_recordingStatus_multiple_requests.html
@@ -1,20 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Recording Status with multiple gUM requests</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.7" src="RecordingStatusHelper.js"></script>
+  <script type="text/javascript" src="RecordingStatusHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 'use strict';
 
 SimpleTest.waitForExplicitFinish();
 
 function test() {
   let localStreams = [];
   TestInit().then(function(eventHelper) {
     /* step 1: create one audio stream
--- a/b2g/components/test/mochitest/test_permission_visibilitychange.html
+++ b/b2g/components/test/mochitest/test_permission_visibilitychange.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Permission Prompt Test</title>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1020179">Permission prompt visibilitychange test</a>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 "use strict";
 
 var gUrl = SimpleTest.getTestFileURL("permission_handler_chrome.js");
 var gScript = SpecialPowers.loadChromeScript(gUrl);
 
 function testDone() {
   gScript.sendAsyncMessage("teardown", "");
--- a/b2g/components/test/mochitest/test_presentation_device_prompt.html
+++ b/b2g/components/test/mochitest/test_presentation_device_prompt.html
@@ -5,17 +5,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test for Presentation Device Selection</title>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Test for Presentation Device Selection</a>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 'use strict';
 
 SimpleTest.waitForExplicitFinish();
 
 var contentEventHandler = null;
 
 var gUrl = SimpleTest.getTestFileURL('presentation_prompt_handler_chrome.js');
--- a/b2g/components/test/mochitest/test_presentation_request_ui_glue.html
+++ b/b2g/components/test/mochitest/test_presentation_request_ui_glue.html
@@ -5,17 +5,17 @@
 <head>
   <meta charset="utf-8">
   <title>Test for Presentation UI Glue</title>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Test for Presentation UI Glue</a>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 'use strict';
 
 SimpleTest.waitForExplicitFinish();
 
 var gScript = SpecialPowers.loadChromeScript(SimpleTest.getTestFileURL('presentation_ui_glue_handler_chrome.js'));
 
 var obs = SpecialPowers.Cc["@mozilla.org/observer-service;1"]
--- a/b2g/components/test/mochitest/test_sandbox_permission.html
+++ b/b2g/components/test/mochitest/test_sandbox_permission.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Permission Prompt Test</title>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=951997">Permission prompt web content test</a>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 "use strict";
 
 const APP_URL = "SandboxPromptTest.html";
 
 var iframe;
 var gUrl = SimpleTest.getTestFileURL("permission_handler_chrome.js");
 var gScript = SpecialPowers.loadChromeScript(gUrl);
--- a/browser/base/content/aboutProviderDirectory.xhtml
+++ b/browser/base/content/aboutProviderDirectory.xhtml
@@ -33,23 +33,23 @@
     </div>
     <div id="activation" hidden="true">
       <p>&social.directory.introText;</p>
       <div><iframe id="activation-frame"/></div>
       <p><a class="link" onclick="openDirectory()">&social.directory.viewmore.text;</a></p>
     </div>
   </body>
 
-  <script type="text/javascript;version=1.8"><![CDATA[
+  <script type="text/javascript"><![CDATA[
     const Cu = Components.utils;
 
     Cu.import("resource://gre/modules/Services.jsm");
 
     function openDirectory() {
-      let url = Services.prefs.getCharPref("social.directories").split(',')[0];
+      let url = Services.prefs.getCharPref("social.directories").split(",")[0];
       window.open(url);
       window.close();
     }
     
     if (Services.prefs.getBoolPref("social.share.activationPanelEnabled")) {
       let url = Services.prefs.getCharPref("social.shareDirectory");
       document.getElementById("activation-frame").setAttribute("src", url);
       document.getElementById("activation").removeAttribute("hidden");
--- a/browser/base/content/aboutSocialError.xhtml
+++ b/browser/base/content/aboutSocialError.xhtml
@@ -30,17 +30,17 @@
       </div>
 
     <div id="button-box">
       <button id="btnTryAgain" onclick="tryAgainButton()"/>
     </div>
     </div>
   </body>
 
-  <script type="text/javascript;version=1.8"><![CDATA[
+  <script type="text/javascript"><![CDATA[
     const Cu = Components.utils;
 
     Cu.import("resource://gre/modules/Services.jsm");
     Cu.import("resource:///modules/Social.jsm");
 
     let config = {
       tryAgainCallback: reloadProvider
     }
@@ -56,20 +56,20 @@
       if (!config.origin) {
         let URI = Services.io.newURI(url);
         config.origin =
           Services.scriptSecurityManager.createCodebasePrincipal(URI, {}).origin;
       }
 
       switch (mode) {
         case "compactInfo":
-          document.getElementById("btnTryAgain").style.display = 'none';
+          document.getElementById("btnTryAgain").style.display = "none";
           break;
         case "tryAgainOnly":
-          //intentional fall-through
+          // intentional fall-through
         case "tryAgain":
           config.tryAgainCallback = loadQueryURL;
           config.queryURL = url;
           break;
         default:
           break;
       }
     }
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -88,10 +88,10 @@
           &tabCrashed.closeTab;</button>
         <button id="restoreTab" class="primary">
           &tabCrashed.restoreTab;</button>
         <button id="restoreAll" autofocus="true" class="primary">
           &tabCrashed.restoreAll;</button>
       </div>
     </div>
   </body>
-  <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutTabCrashed.js"/>
+  <script type="text/javascript" src="chrome://browser/content/aboutTabCrashed.js"/>
 </html>
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
@@ -91,14 +91,14 @@
 
         </section>
       </div>
 
     </div>
 
     <iframe mozframetype="content" id="remote" />
 
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
       src="chrome://browser/content/utilityOverlay.js"/>
-    <script type="text/javascript;version=1.8"
+    <script type="text/javascript"
       src="chrome://browser/content/aboutaccounts/aboutaccounts.js" />
   </body>
 </html>
--- a/browser/base/content/abouthealthreport/abouthealth.xhtml
+++ b/browser/base/content/abouthealthreport/abouthealth.xhtml
@@ -16,16 +16,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
    <title>&abouthealth.pagetitle;</title>
    <link rel="icon" type="image/png" id="favicon"
          href="chrome://branding/content/icon32.png"/>
    <link rel="stylesheet"
      href="chrome://browser/content/abouthealthreport/abouthealth.css"
      type="text/css" />
-   <script type="text/javascript;version=1.8"
+   <script type="text/javascript"
      src="chrome://browser/content/abouthealthreport/abouthealth.js" />
   </head>
   <body>
     <iframe id="remote-report"/>
   </body>
 </html>
 
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -334,17 +334,17 @@ function showSnippets() {
   if (snippets) {
     // Injecting snippets can throw if they're invalid XML.
     try {
       snippetsElt.innerHTML = snippets;
       // Scripts injected by innerHTML are inactive, so we have to relocate them
       // through DOM manipulation to activate their contents.
       Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) {
         let relocatedScript = document.createElement("script");
-        relocatedScript.type = "text/javascript;version=1.8";
+        relocatedScript.type = "text/javascript";
         relocatedScript.text = elt.text;
         elt.parentNode.replaceChild(relocatedScript, elt);
       });
       return;
     } catch (ex) {
       // Bad content, continue to show default snippets.
     }
   }
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -23,19 +23,19 @@
 
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" type="text/css" media="all"
           href="chrome://browser/content/contentSearchUI.css"/>
     <link rel="stylesheet" type="text/css" media="all" defer="defer"
           href="chrome://browser/content/abouthome/aboutHome.css"/>
 
-    <script type="text/javascript;version=1.8"
+    <script type="text/javascript"
             src="chrome://browser/content/abouthome/aboutHome.js"/>
-    <script type="text/javascript;version=1.8"
+    <script type="text/javascript"
             src="chrome://browser/content/contentSearchUI.js"/>
   </head>
 
   <body dir="&locale.dir;">
     <div class="spacer"/>
     <div id="topSection">
       <div id="brandLogo"></div>
 
--- a/browser/base/content/newtab/newTab.xhtml
+++ b/browser/base/content/newtab/newTab.xhtml
@@ -86,11 +86,11 @@
     </div>
 
     <div id="newtab-margin-bottom"/>
   </div>
   <input id="newtab-customize-button" type="button" dir="&locale.dir;"
          value="&#x2699;"
          title="&newtab.customize.title;"/>
 </body>
-<script type="text/javascript;version=1.8" src="chrome://browser/content/contentSearchUI.js"/>
-<script type="text/javascript;version=1.8" src="chrome://browser/content/newtab/newTab.js"/>
+<script type="text/javascript" src="chrome://browser/content/contentSearchUI.js"/>
+<script type="text/javascript" src="chrome://browser/content/newtab/newTab.js"/>
 </html>
--- a/browser/base/content/sync/aboutSyncTabs.xul
+++ b/browser/base/content/sync/aboutSyncTabs.xul
@@ -14,17 +14,17 @@
 ]>
 
 <window id="tabs-display"
         onload="RemoteTabViewer.init()"
         onunload="RemoteTabViewer.uninit()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&tabs.otherDevices.label;">
-  <script type="application/javascript;version=1.8" src="chrome://browser/content/sync/aboutSyncTabs.js"/>
+  <script type="application/javascript" src="chrome://browser/content/sync/aboutSyncTabs.js"/>
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
   <html:head>
     <html:link rel="icon" href="chrome://browser/skin/sync-16.png"/>
   </html:head>
 
   <popupset id="contextmenus">
     <menupopup id="tabListContext">
       <menuitem label="&tabs.context.openTab.label;"
--- a/browser/base/content/test/general/accounts_testRemoteCommands.html
+++ b/browser/base/content/test/general/accounts_testRemoteCommands.html
@@ -1,83 +1,83 @@
-<html>
-  <head>
-    <meta charset="utf-8">
-
-<script type="text/javascript;version=1.8">
-
-function init() {
-  window.addEventListener("message", function process(e) {doTest(e)});
-  // unless we relinquish the eventloop,
-  // tests will run before the chrome event handlers are ready
-  setTimeout(doTest, 0);
-}
-
-function checkStatusValue(payload, expectedValue) {
-  return payload.status == expectedValue;
-}
-
-let tests = [
-{
-  info: "Check account log in",
-  event: "login",
-  data: {
-    email: "foo@example.com",
-    uid: "1234@lcip.org",
-    assertion: "foobar",
-    sessionToken: "dead",
-    kA: "beef",
-    kB: "cafe",
-    verified: true
-  },
-  payloadType: "message",
-  validateResponse: function(payload) {
-    return checkStatusValue(payload, "login");
-  },
-},
-];
-
-let currentTest = -1;
-function doTest(evt) {
-  if (evt) {
-    if (currentTest < 0 || !evt.data.content)
-      return; // not yet testing
-
-    let test = tests[currentTest];
-    if (evt.data.type != test.payloadType)
-      return; // skip unrequested events
-
-    let error = JSON.stringify(evt.data.content);
-    let pass = false;
-    try {
-      pass = test.validateResponse(evt.data.content)
-    } catch (e) {}
-    reportResult(test.info, pass, error);
-  }
-  // start the next test if there are any left
-  if (tests[++currentTest])
-    sendToBrowser(tests[currentTest].event, tests[currentTest].data);
-  else
-    reportFinished();
-}
-
-function reportResult(info, pass, error) {
-  let data = {type: "testResult", info: info, pass: pass, error: error};
-  let event = new CustomEvent("FirefoxAccountsTestResponse", {detail: {data: data}, bubbles: true});
-  document.dispatchEvent(event);
-}
-
-function reportFinished(cmd) {
-  let data = {type: "testsComplete", count: tests.length};
-  let event = new CustomEvent("FirefoxAccountsTestResponse", {detail: {data: data}, bubbles: true});
-  document.dispatchEvent(event);
-}
-
-function sendToBrowser(type, data) {
-  let event = new CustomEvent("FirefoxAccountsCommand", {detail: {command: type, data: data}, bubbles: true});
-  document.dispatchEvent(event);
-}
-
-</script>
-  </head>
-  <body onload="init()">
-  </body>
-</html>
+<html>
+  <head>
+    <meta charset="utf-8">
+
+<script type="text/javascript">
+
+function init() {
+  window.addEventListener("message", function process(e) { doTest(e) });
+  // unless we relinquish the eventloop,
+  // tests will run before the chrome event handlers are ready
+  setTimeout(doTest, 0);
+}
+
+function checkStatusValue(payload, expectedValue) {
+  return payload.status == expectedValue;
+}
+
+let tests = [
+{
+  info: "Check account log in",
+  event: "login",
+  data: {
+    email: "foo@example.com",
+    uid: "1234@lcip.org",
+    assertion: "foobar",
+    sessionToken: "dead",
+    kA: "beef",
+    kB: "cafe",
+    verified: true
+  },
+  payloadType: "message",
+  validateResponse(payload) {
+    return checkStatusValue(payload, "login");
+  },
+},
+];
+
+let currentTest = -1;
+function doTest(evt) {
+  if (evt) {
+    if (currentTest < 0 || !evt.data.content)
+      return; // not yet testing
+
+    let test = tests[currentTest];
+    if (evt.data.type != test.payloadType)
+      return; // skip unrequested events
+
+    let error = JSON.stringify(evt.data.content);
+    let pass = false;
+    try {
+      pass = test.validateResponse(evt.data.content)
+    } catch (e) {}
+    reportResult(test.info, pass, error);
+  }
+  // start the next test if there are any left
+  if (tests[++currentTest])
+    sendToBrowser(tests[currentTest].event, tests[currentTest].data);
+  else
+    reportFinished();
+}
+
+function reportResult(info, pass, error) {
+  let data = {type: "testResult", info, pass, error};
+  let event = new CustomEvent("FirefoxAccountsTestResponse", {detail: {data}, bubbles: true});
+  document.dispatchEvent(event);
+}
+
+function reportFinished(cmd) {
+  let data = {type: "testsComplete", count: tests.length};
+  let event = new CustomEvent("FirefoxAccountsTestResponse", {detail: {data}, bubbles: true});
+  document.dispatchEvent(event);
+}
+
+function sendToBrowser(type, data) {
+  let event = new CustomEvent("FirefoxAccountsCommand", {detail: {command: type, data}, bubbles: true});
+  document.dispatchEvent(event);
+}
+
+</script>
+  </head>
+  <body onload="init()">
+  </body>
+</html>
--- a/browser/base/content/test/general/contentSearchUI.html
+++ b/browser/base/content/test/general/contentSearchUI.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <html>
 <head>
 <meta charset="utf-8">
-<script type="application/javascript;version=1.8"
+<script type="application/javascript"
         src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js">
 </script>
-<script type="application/javascript;version=1.8"
+<script type="application/javascript"
         src="chrome://browser/content/contentSearchUI.js">
 </script>
 <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css"/>
 </head>
 <body>
 
 <div id="container" style="position: relative;"><input type="text" value=""/></div>
 
--- a/browser/base/content/test/general/healthreport_testRemoteCommands.html
+++ b/browser/base/content/test/general/healthreport_testRemoteCommands.html
@@ -1,27 +1,27 @@
 <html>
   <head>
     <meta charset="utf-8">
-<script type="application/javascript;version=1.7"
+<script type="application/javascript"
             src="healthreport_pingData.js">
 </script>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 function init() {
   window.addEventListener("message", doTest);
   doTest();
 }
 
 function checkSubmissionValue(payload, expectedValue) {
   return payload.enabled == expectedValue;
 }
 
 function isArray(arg) {
-  return Object.prototype.toString.call(arg) === '[object Array]';
+  return Object.prototype.toString.call(arg) === "[object Array]";
 }
 
 function writeDiagnostic(text) {
   let node = document.createTextNode(text);
   let br = document.createElement("br");
   document.body.appendChild(node);
   document.body.appendChild(br);
 }
@@ -57,31 +57,31 @@ function validateTelemetryPingList(list)
   list = list.filter(p => TEST_TYPES_REGEX.test(p.type));
 
   if (list.length != TEST_PINGS.length) {
     console.log("Telemetry ping length is not correct.");
     return false;
   }
 
   let valid = true;
-  for (let i=0; i<list.length; ++i) {
+  for (let i = 0; i < list.length; ++i) {
     let received = list[i];
     let expected = TEST_PINGS[i];
     if (received.type != expected.type ||
         received.timestampCreated != expected.date.getTime()) {
       writeDiagnostic("Telemetry ping " + i + " does not match.");
       writeDiagnostic("Expected: " + JSON.stringify(expected));
       writeDiagnostic("Received: " + JSON.stringify(received));
       valid = false;
     } else {
       writeDiagnostic("Telemetry ping " + i + " matches.");
     }
   }
 
-  return true;
+  return valid;
 }
 
 function validateTelemetryPingData(expected, received) {
   const receivedDate = new Date(received.creationDate);
   if (received.id != expected.id ||
       received.type != expected.type ||
       receivedDate.getTime() != expected.date.getTime()) {
     writeDiagnostic("Telemetry ping data for " + expected.id + " doesn't match.");
@@ -94,97 +94,97 @@ function validateTelemetryPingData(expec
   return true;
 }
 
 var tests = [
 {
   info: "Checking initial value is enabled",
   event: "RequestCurrentPrefs",
   payloadType: "prefs",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return checkSubmissionValue(payload, true);
   },
 },
 {
   info: "Verifying disabling works",
   event: "DisableDataSubmission",
   payloadType: "prefs",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return checkSubmissionValue(payload, false);
   },
 },
 {
   info: "Verifying we're still disabled",
   event: "RequestCurrentPrefs",
   payloadType: "prefs",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return checkSubmissionValue(payload, false);
   },
 },
 {
   info: "Verifying that we can get the current ping data while submission is disabled",
   event: "RequestCurrentPingData",
   payloadType: "telemetry-current-ping-data",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return validateCurrentTelemetryPingData(payload);
   },
 },
 {
   info: "Verifying enabling works",
   event: "EnableDataSubmission",
   payloadType: "prefs",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return checkSubmissionValue(payload, true);
   },
 },
 {
   info: "Verifying we're still re-enabled",
   event: "RequestCurrentPrefs",
   payloadType: "prefs",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return checkSubmissionValue(payload, true);
   },
 },
 {
   info: "Verifying that we can get the current Telemetry environment data",
   event: "RequestCurrentEnvironment",
   payloadType: "telemetry-current-environment-data",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return validateCurrentTelemetryEnvironment(payload);
   },
 },
 {
   info: "Verifying that we can get the current Telemetry ping data",
   event: "RequestCurrentPingData",
   payloadType: "telemetry-current-ping-data",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     return validateCurrentTelemetryPingData(payload);
   },
 },
 {
   info: "Verifying that we get the proper Telemetry ping list",
   event: "RequestTelemetryPingList",
   payloadType: "telemetry-ping-list",
-  validateResponse: function(payload) {
+  validateResponse(payload) {
     // Validate the ping list
     if (!validateTelemetryPingList(payload)) {
       return false;
     }
 
     // Now that we received the ping ids, set up additional test tasks
     // that check loading the individual pings.
-    for (let i=0; i<TEST_PINGS.length; ++i) {
+    for (let i = 0; i < TEST_PINGS.length; ++i) {
       TEST_PINGS[i].id = payload[i].id;
       tests.push({
         info: "Verifying that we can get the proper Telemetry ping data #" + (i + 1),
         event: "RequestTelemetryPingData",
         eventData: { id: TEST_PINGS[i].id },
         payloadType: "telemetry-ping-data",
-        validateResponse: function(payload) {
-          return validateTelemetryPingData(TEST_PINGS[i], payload.pingData);
+        validateResponse(payload2) {
+          return validateTelemetryPingData(TEST_PINGS[i], payload2.pingData);
         },
       });
     }
 
     return true;
   },
 },
 ];
@@ -209,35 +209,35 @@ function doTest(evt) {
   // start the next test if there are any left
   if (tests[++currentTest])
     sendToBrowser(tests[currentTest].event, tests[currentTest].eventData);
   else
     reportFinished();
 }
 
 function reportResult(info, pass, error) {
-  var data = {type: "testResult", info: info, pass: pass, error: error};
-  var event = new CustomEvent("FirefoxHealthReportTestResponse", {detail: {data: data}, bubbles: true});
+  var data = {type: "testResult", info, pass, error};
+  var event = new CustomEvent("FirefoxHealthReportTestResponse", {detail: {data}, bubbles: true});
   document.dispatchEvent(event);
 }
 
 function reportFinished(cmd) {
   var data = {type: "testsComplete", count: tests.length};
-  var event = new CustomEvent("FirefoxHealthReportTestResponse", {detail: {data: data}, bubbles: true});
+  var event = new CustomEvent("FirefoxHealthReportTestResponse", {detail: {data}, bubbles: true});
   document.dispatchEvent(event);
 }
 
 function sendToBrowser(type, eventData) {
   eventData = eventData || {};
   let detail = {command: type};
   for (let key of Object.keys(eventData)) {
     detail[key] = eventData[key];
   }
 
-  var event = new CustomEvent("RemoteHealthReportCommand", {detail: detail, bubbles: true});
+  var event = new CustomEvent("RemoteHealthReportCommand", {detail, bubbles: true});
   document.dispatchEvent(event);
 }
 
 </script>
   </head>
   <body onload="init()">
   </body>
 </html>
--- a/browser/components/contextualidentity/test/browser/file_set_storages.html
+++ b/browser/components/contextualidentity/test/browser/file_set_storages.html
@@ -1,15 +1,15 @@
 <html>
   <head>
     <meta charset="UTF-8">
     <title>Bug 1238183</title>
   </head>
   <body>
-    <script type="application/javascript;version=1.7">
+    <script type="application/javascript">
       "use strict";
 
       // if we have a query string, use it to set storages
       if (window.location.search.length > 0) {
         let context_name = window.location.search.substr(1);
         localStorage.setItem("userContext", context_name);
         sessionStorage.setItem("userContext", context_name);
 
--- a/browser/components/migration/content/aboutWelcomeBack.xhtml
+++ b/browser/components/migration/content/aboutWelcomeBack.xhtml
@@ -17,17 +17,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&welcomeback2.tabtitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/>
     <link rel="icon" type="image/png" href="chrome://global/skin/icons/information-16.png"/>
 
-    <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutSessionRestore.js"/>
+    <script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
   </head>
 
   <body dir="&locale.dir;">
 
     <div class="container">
 
       <div class="title">
         <h1 class="title-text">&welcomeback2.pageTitle;</h1>
--- a/browser/components/originattributes/test/browser/file_broadcastChannel.html
+++ b/browser/components/originattributes/test/browser/file_broadcastChannel.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Page broadcast channel creator for first party isolation</title>
 </head>
 <body>
   <div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div>
   <iframe id="iframe" src="file_broadcastChanneliFrame.html"></iframe>>
-<script type="text/javascript;version=1.7">
+<script type="text/javascript">
 let bc = new BroadcastChannel("testBroadcastChannel");
-bc.onmessage = function (e) {
+bc.onmessage = function(e) {
   document.getElementById("display").innerHTML = e.data;
 };
 </script>
 </body>
--- a/browser/components/originattributes/test/browser/file_broadcastChanneliFrame.html
+++ b/browser/components/originattributes/test/browser/file_broadcastChanneliFrame.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title>Page broadcast channel responder for first party isolation</title>
 </head>
 <body>
   <div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div>
-<script type="text/javascript;version=1.7">
+<script type="text/javascript">
 let bc = new BroadcastChannel("testBroadcastChannel");
-bc.onmessage = function (e) {
+bc.onmessage = function(e) {
   window.parent.postMessage(e.data, "*");
 };
 </script>
 </body>
--- a/browser/components/originattributes/test/mochitest/test_permissions_api.html
+++ b/browser/components/originattributes/test/mochitest/test_permissions_api.html
@@ -9,83 +9,83 @@
   <meta charset="utf-8">
   <title>Test for Permissions API</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 </head>
 
 <body>
   <pre id="test"></pre>
-  <script type="application/javascript;version=1.8">
-  /*globals SpecialPowers, SimpleTest, is, ok, */
-  'use strict';
+  <script type="application/javascript">
+  /* globals SpecialPowers, SimpleTest, is, ok, */
+  "use strict";
 
   const {
     UNKNOWN_ACTION,
     PROMPT_ACTION,
     ALLOW_ACTION,
     DENY_ACTION
   } = SpecialPowers.Ci.nsIPermissionManager;
 
   SimpleTest.waitForExplicitFinish();
 
   const PERMISSIONS = [{
-    name: 'geolocation',
-    type: 'geo'
+    name: "geolocation",
+    type: "geo"
   }, {
-    name: 'notifications',
-    type: 'desktop-notification'
+    name: "notifications",
+    type: "desktop-notification"
   }, {
-    name: 'push',
-    type: 'desktop-notification'
+    name: "push",
+    type: "desktop-notification"
   }, {
-    name: 'persistent-storage',
-    type: 'persistent-storage'
+    name: "persistent-storage",
+    type: "persistent-storage"
   }, ];
 
   const UNSUPPORTED_PERMISSIONS = [
-    'foobarbaz', // Not in spec, for testing only.
-    'midi',
+    "foobarbaz", // Not in spec, for testing only.
+    "midi",
   ];
 
   // Create a closure, so that tests are run on the correct window object.
   function createPermissionTester(aWindow) {
     return {
       setPermissions(allow) {
         const permissions = PERMISSIONS.map(({ type }) => {
           return {
             type,
             allow,
-            'context': aWindow.document
+            "context": aWindow.document
           };
         });
         return new Promise((resolve) => {
           SpecialPowers.popPermissions(() => {
             SpecialPowers.pushPermissions(permissions, resolve);
           });
         });
       },
       revokePermissions() {
-        const promisesToRevoke = PERMISSIONS.map(({ name })  => {
+        const promisesToRevoke = PERMISSIONS.map(({ name }) => {
           return aWindow.navigator.permissions
             .revoke({ name })
             .then(
-              ({ state }) => is(state, 'prompt', `correct state for '${name}'`),
+              ({ state }) => is(state, "prompt", `correct state for '${name}'`),
               () => ok(false, `revoke should not have rejected for '${name}'`)
             );
         });
         return Promise.all(promisesToRevoke);
       },
       revokeUnsupportedPermissions() {
         const promisesToRevoke = UNSUPPORTED_PERMISSIONS.map(({ name }) => {
           return aWindow.navigator.permissions
             .revoke({ name })
             .then(
               () => ok(false, `revoke should not have resolved for '${name}'`),
-              error => is(error.name, 'TypeError', `revoke should have thrown TypeError for '${name}'`)
+              error => is(error.name, "TypeError", `revoke should have thrown TypeError for '${name}'`)
             );
         });
         return Promise.all(promisesToRevoke);
       },
       checkPermissions(state) {
         const promisesToQuery = PERMISSIONS.map(({ name }) => {
           return aWindow.navigator.permissions
             .query({ name })
@@ -98,17 +98,17 @@
       },
       checkUnsupportedPermissions() {
         const promisesToQuery = UNSUPPORTED_PERMISSIONS.map(({ name }) => {
           return aWindow.navigator.permissions
             .query({ name })
             .then(
               () => ok(false, `query should not have resolved for '${name}'`),
               error => {
-                is(error.name, 'TypeError',
+                is(error.name, "TypeError",
                   `query should have thrown TypeError for '${name}'`);
               }
             );
           });
         return Promise.all(promisesToQuery);
       },
       promiseStateChanged(name, state) {
         return aWindow.navigator.permissions
@@ -122,85 +122,85 @@
               };
             });
           },
           () => ok(false, `query should not have rejected for '${name}'`));
       },
       testStatusOnChange() {
         return new Promise((resolve) => {
           SpecialPowers.popPermissions(() => {
-            const permission = 'geolocation';
-            const promiseGranted = this.promiseStateChanged(permission, 'granted');
+            const permission = "geolocation";
+            const promiseGranted = this.promiseStateChanged(permission, "granted");
             this.setPermissions(ALLOW_ACTION);
             promiseGranted.then(() => {
-              const promisePrompt = this.promiseStateChanged(permission, 'prompt');
+              const promisePrompt = this.promiseStateChanged(permission, "prompt");
               SpecialPowers.popPermissions();
               return promisePrompt;
             }).then(resolve);
           });
         });
       },
       testInvalidQuery() {
         return aWindow.navigator.permissions
-          .query({ name: 'invalid' })
+          .query({ name: "invalid" })
           .then(
-            () => ok(false, 'invalid query should not have resolved'),
-            () => ok(true, 'invalid query should have rejected')
+            () => ok(false, "invalid query should not have resolved"),
+            () => ok(true, "invalid query should have rejected")
           );
       },
       testInvalidRevoke() {
         return aWindow.navigator.permissions
-          .revoke({ name: 'invalid' })
+          .revoke({ name: "invalid" })
           .then(
-            () => ok(false, 'invalid revoke should not have resolved'),
-            () => ok(true, 'invalid revoke should have rejected')
+            () => ok(false, "invalid revoke should not have resolved"),
+            () => ok(true, "invalid revoke should have rejected")
           );
       },
     };
   }
 
   function enablePrefs() {
     const ops = {
-      'set': [
-        ['dom.permissions.revoke.enable', true],
-        ['privacy.firstparty.isolate', true],
+      "set": [
+        ["dom.permissions.revoke.enable", true],
+        ["privacy.firstparty.isolate", true],
       ],
     };
     return SpecialPowers.pushPrefEnv(ops);
   }
 
   function createIframe() {
     return new Promise((resolve) => {
-      const iframe = document.createElement('iframe');
-      iframe.src = 'file_empty.html';
+      const iframe = document.createElement("iframe");
+      iframe.src = "file_empty.html";
       iframe.onload = () => resolve(iframe.contentWindow);
       document.body.appendChild(iframe);
     });
   }
-  debugger;
+
   window.onload = () => {
     enablePrefs()
       .then(createIframe)
       .then(createPermissionTester)
       .then((tester) => {
         return tester
           .checkUnsupportedPermissions()
           .then(() => tester.setPermissions(UNKNOWN_ACTION))
-          .then(() => tester.checkPermissions('prompt'))
+          .then(() => tester.checkPermissions("prompt"))
           .then(() => tester.setPermissions(PROMPT_ACTION))
-          .then(() => tester.checkPermissions('prompt'))
+          .then(() => tester.checkPermissions("prompt"))
           .then(() => tester.setPermissions(ALLOW_ACTION))
-          .then(() => tester.checkPermissions('granted'))
+          .then(() => tester.checkPermissions("granted"))
           .then(() => tester.setPermissions(DENY_ACTION))
-          .then(() => tester.checkPermissions('denied'))
+          .then(() => tester.checkPermissions("denied"))
           .then(() => tester.testStatusOnChange())
           .then(() => tester.testInvalidQuery())
           .then(() => tester.revokeUnsupportedPermissions())
           .then(() => tester.revokePermissions())
-          .then(() => tester.checkPermissions('prompt'))
+          .then(() => tester.checkPermissions("prompt"))
           .then(() => tester.testInvalidRevoke());
       })
       .then(SimpleTest.finish)
       .catch((e) => {
         ok(false, `Unexpected error ${e}`);
         SimpleTest.finish();
       });
   };
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -17,17 +17,17 @@
   %aboutPrivateBrowsingDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" class="private">
   <head>
     <link id="favicon" rel="icon" type="image/png"/>
     <link rel="stylesheet" href="chrome://browser/content/aboutPrivateBrowsing.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css" type="text/css" media="all"/>
-    <script type="application/javascript;version=1.7" src="chrome://browser/content/aboutPrivateBrowsing.js"></script>
+    <script type="application/javascript" src="chrome://browser/content/aboutPrivateBrowsing.js"></script>
   </head>
 
   <body dir="&locale.dir;">
     <p class="showNormal">&aboutPrivateBrowsing.notPrivate;</p>
     <button xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             id="startPrivateBrowsing"
             class="showNormal"
             label="&privatebrowsingpage.openPrivateWindow.label;"
--- a/browser/components/search/content/searchReset.xhtml
+++ b/browser/components/search/content/searchReset.xhtml
@@ -21,17 +21,17 @@
     <title>&searchreset.tabtitle;</title>
     <link rel="stylesheet" type="text/css" media="all"
           href="chrome://global/skin/in-content/info-pages.css"/>
     <link rel="stylesheet" type="text/css" media="all"
           href="chrome://browser/skin/searchReset.css"/>
     <link rel="icon" type="image/png"
           href="chrome://browser/skin/favicon-search-16.svg"/>
 
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="chrome://browser/content/search/searchReset.js"/>
   </head>
 
   <body dir="&locale.dir;">
 
     <div class="container">
       <div class="title">
         <h1 class="title-text">&searchreset.pageTitle;</h1>
--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
@@ -17,17 +17,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&restorepage.tabtitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/>
     <link rel="icon" type="image/png" href="chrome://global/skin/icons/warning-16.png"/>
 
-    <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutSessionRestore.js"/>
+    <script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
   </head>
 
   <body dir="&locale.dir;">
 
     <div class="container restore-chosen">
 
       <div class="title">
         <h1 class="title-text">&restorepage.errorTitle;</h1>
--- a/browser/components/sessionstore/test/browser_formdata_sample.html
+++ b/browser/components/sessionstore/test/browser_formdata_sample.html
@@ -2,17 +2,17 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title>browser_formdata_sample.html</title>
   </head>
   <body>
     <input id="txt" />
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       let isOuter = window == window.top;
 
       if (isOuter) {
         let iframe = document.createElement("iframe");
         iframe.setAttribute("src", "https://example.com" + location.pathname);
         document.body.appendChild(iframe);
       }
     </script>
--- a/browser/components/sessionstore/test/browser_sessionStorage.html
+++ b/browser/components/sessionstore/test/browser_sessionStorage.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title>browser_sessionStorage.html</title>
   </head>
   <body>
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       let isOuter = window == window.top;
       let args = window.location.search.slice(1).split("&");
       let rand = args[0];
 
       if (isOuter) {
         let iframe = document.createElement("iframe");
         let isSecure = args.indexOf("secure") > -1;
         let scheme = isSecure ? "https" : "http";
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -12,17 +12,17 @@
   %globalDTD;
   <!ENTITY % syncBrandDTD
     SYSTEM "chrome://browser/locale/syncBrand.dtd">
   %syncBrandDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
-    <script src="chrome://browser/content/syncedtabs/sidebar.js" type="application/javascript;version=1.8"></script>
+    <script src="chrome://browser/content/syncedtabs/sidebar.js" type="application/javascript"></script>
     <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/syncedtabs/sidebar.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/textbox.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/content/browser.css"/>
     <title>&syncedTabs.sidebar.label;</title>
   </head>
--- a/caps/tests/mochitest/test_addonMayLoad.html
+++ b/caps/tests/mochitest/test_addonMayLoad.html
@@ -4,17 +4,17 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1180921
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1180921</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   /** Test for Bug 1180921 **/
   const Cc = Components.classes;
   const Ci = Components.interfaces;
   const Cu = Components.utils;
   Cu.import("resource://gre/modules/Services.jsm");
   let ssm = Services.scriptSecurityManager;
   let aps = Cc["@mozilla.org/addons/policy-service;1"].getService(Ci.nsIAddonPolicyService).wrappedJSObject;
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -8,18 +8,18 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="text/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=292789">Mozilla Bug 292789</a>
 <p id="display"></p>
 <div id="content" style="display: none">
   <script src="chrome://global/content/treeUtils.js"></script>
-  <script type="application/javascript;version=1.8" src="chrome://mozapps/content/xpinstall/xpinstallConfirm.js"></script>
-  <script id="resjs" type="application/javascript;version=1.8"></script>
+  <script type="application/javascript" src="chrome://mozapps/content/xpinstall/xpinstallConfirm.js"></script>
+  <script id="resjs" type="application/javascript"></script>
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 292789
  **
  ** Selectively allow access to whitelisted chrome packages
  ** even for ALLOW_CHROME mechanisms (<script>, <img> etc)
--- a/devtools/client/aboutdebugging/aboutdebugging.xhtml
+++ b/devtools/client/aboutdebugging/aboutdebugging.xhtml
@@ -11,13 +11,13 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutDebugging.fullTitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/aboutdebugging/aboutdebugging.css"  type="text/css"/>
     <script type="application/javascript" src="resource://devtools/client/shared/vendor/react.js"></script>
-    <script type="application/javascript;version=1.8" src="chrome://devtools/content/aboutdebugging/initializer.js"></script>
+    <script type="application/javascript" src="chrome://devtools/content/aboutdebugging/initializer.js"></script>
   </head>
   <body id="body" dir="&locale.dir;">
   </body>
 </html>
--- a/devtools/client/animationinspector/animation-inspector.xhtml
+++ b/devtools/client/animationinspector/animation-inspector.xhtml
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://devtools/skin/animationinspector.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
+    <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body class="theme-sidebar devtools-monospace" role="application" empty="true">
     <div id="global-toolbar" class="theme-toolbar">
       <span id="all-animations-label" class="label"></span>
       <button id="toggle-all" class="devtools-button pause-button"></button>
     </div>
     <div id="timeline-toolbar" class="theme-toolbar">
       <button id="rewind-timeline" class="devtools-button"></button>
@@ -21,12 +21,12 @@
       <span id="timeline-current-time" class="label"></span>
     </div>
     <div id="players"></div>
     <div id="error-message">
       <p id="error-type"></p>
       <p id="error-hint"></p>
       <button id="element-picker" data-standalone="true" class="devtools-button"></button>
     </div>
-    <script type="application/javascript;version=1.8" src="animation-controller.js"></script>
-    <script type="application/javascript;version=1.8" src="animation-panel.js"></script>
+    <script type="application/javascript" src="animation-controller.js"></script>
+    <script type="application/javascript" src="animation-panel.js"></script>
   </body>
 </html>
--- a/devtools/client/canvasdebugger/test/doc_raf-begin.html
+++ b/devtools/client/canvasdebugger/test/doc_raf-begin.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         ctx.fillStyle = fill;
         ctx.fillRect(size[0], size[1], size[2], size[3]);
       }
--- a/devtools/client/canvasdebugger/test/doc_settimeout.html
+++ b/devtools/client/canvasdebugger/test/doc_settimeout.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         ctx.fillStyle = fill;
         ctx.fillRect(size[0], size[1], size[2], size[3]);
       }
--- a/devtools/client/canvasdebugger/test/doc_simple-canvas-bitmasks.html
+++ b/devtools/client/canvasdebugger/test/doc_simple-canvas-bitmasks.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         ctx.fillStyle = fill;
         ctx.fillRect(size[0], size[1], size[2], size[3]);
       }
--- a/devtools/client/canvasdebugger/test/doc_simple-canvas-deep-stack.html
+++ b/devtools/client/canvasdebugger/test/doc_simple-canvas-deep-stack.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         function A() {
           function B() {
             function C() {
--- a/devtools/client/canvasdebugger/test/doc_simple-canvas-transparent.html
+++ b/devtools/client/canvasdebugger/test/doc_simple-canvas-transparent.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         ctx.fillStyle = fill;
         ctx.fillRect(size[0], size[1], size[2], size[3]);
       }
--- a/devtools/client/canvasdebugger/test/doc_simple-canvas.html
+++ b/devtools/client/canvasdebugger/test/doc_simple-canvas.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>Canvas inspector test page</title>
   </head>
 
   <body>
     <canvas width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       var ctx = document.querySelector("canvas").getContext("2d");
 
       function drawRect(fill, size) {
         ctx.fillStyle = fill;
         ctx.fillRect(size[0], size[1], size[2], size[3]);
       }
--- a/devtools/client/canvasdebugger/test/doc_webgl-bindings.html
+++ b/devtools/client/canvasdebugger/test/doc_webgl-bindings.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>WebGL editor test page</title>
   </head>
 
   <body>
     <canvas id="canvas" width="1024" height="1024"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
       let customFramebuffer;
       let customRenderbuffer;
       let customTexture;
 
       window.onload = function() {
--- a/devtools/client/canvasdebugger/test/doc_webgl-drawArrays.html
+++ b/devtools/client/canvasdebugger/test/doc_webgl-drawArrays.html
@@ -21,17 +21,17 @@
     <script id="shader-vs" type="x-shader/x-vertex">
       attribute vec3 aVertexPosition;
 
       void main(void) {
         gl_PointSize = 5.0;
         gl_Position = vec4(aVertexPosition, 1.0);
       }
     </script>
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl, shaderProgram;
       let triangleVertexPositionBuffer, squareVertexPositionBuffer;
      
       window.onload = function() {
         canvas = document.querySelector("canvas");
         gl = canvas.getContext("webgl", { preserveDrawingBuffer: true });
--- a/devtools/client/canvasdebugger/test/doc_webgl-drawElements.html
+++ b/devtools/client/canvasdebugger/test/doc_webgl-drawElements.html
@@ -21,17 +21,17 @@
     <script id="shader-vs" type="x-shader/x-vertex">
       attribute vec3 aVertexPosition;
 
       void main(void) {
         gl_PointSize = 5.0;
         gl_Position = vec4(aVertexPosition, 1.0);
       }
     </script>
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl, shaderProgram;
       let triangleVertexPositionBuffer, squareVertexPositionBuffer;
       let triangleIndexBuffer;
       let squareIndexBuffer, squareStripIndexBuffer, squareFanIndexBuffer
      
       window.onload = function() {
--- a/devtools/client/canvasdebugger/test/doc_webgl-enum.html
+++ b/devtools/client/canvasdebugger/test/doc_webgl-enum.html
@@ -6,17 +6,17 @@
   <head>
     <meta charset="utf-8"/>
     <title>WebGL editor test page</title>
   </head>
 
   <body>
     <canvas id="canvas" width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
 
       window.onload = function() {
         canvas = document.querySelector("canvas");
         gl = canvas.getContext("webgl", { preserveDrawingBuffer: true });
         gl.clearColor(0.0, 0.0, 0.0, 1.0);
--- a/devtools/client/commandline/test/browser_cmd_csscoverage_page1.html
+++ b/devtools/client/commandline/test/browser_cmd_csscoverage_page1.html
@@ -33,17 +33,17 @@
     /* TODO: include examples of all CSS rules in
     https://developer.mozilla.org/en-US/docs/Web/API/CSSRule
     and include tests for rules nested in media rules, etc */
 
     /* We're not testing unparable CSS right now */
   </style>
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetA.css">
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetB.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   /* How quickly do we rush through this? */
   let delay = 500;
   window.addEventListener("load", () => {
     dump('TEST-INFO | load from browser_cmd_csscoverage_page1.html\n');
     setTimeout(() => {
       dump('TEST-INFO | timeout from browser_cmd_csscoverage_page1.html\n');
       /* This adds <div class=page1-test5></div> */
       let parent = document.querySelector("#page1-test5-holder");
--- a/devtools/client/commandline/test/browser_cmd_csscoverage_page2.html
+++ b/devtools/client/commandline/test/browser_cmd_csscoverage_page2.html
@@ -17,17 +17,17 @@
     /* This doesn't match until the event fires */
     .page2-test3 {
       color: #023;
     }
   </style>
 
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetA.css">
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetB.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   /* How quickly do we rush through this? */
   let delay = 500;
   window.addEventListener("load", () => {
     dump('TEST-INFO | load from browser_cmd_csscoverage_page2.html\n');
     setTimeout(() => {
       dump('TEST-INFO | timeout from browser_cmd_csscoverage_page2.html\n');
       /* This adds <div class=page2-test3></div> */
       let parent = document.querySelector("#page2-test3-holder");
--- a/devtools/client/commandline/test/browser_cmd_csscoverage_page3.html
+++ b/devtools/client/commandline/test/browser_cmd_csscoverage_page3.html
@@ -18,17 +18,17 @@
   <style>
     /* This also should not match below, but in a second inline sheet */
     .page3-test3 {
       color: #033;
     }
   </style>
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetA.css">
   <link rel="stylesheet" type="text/css" href="browser_cmd_csscoverage_sheetB.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   window.addEventListener("load", () => {
     dump('TEST-INFO | load from browser_cmd_csscoverage_page3.html\n');
   });
   </script>
 </head>
 <body>
 
 <h2>Page 3</h2>
--- a/devtools/client/debugger/debugger.xul
+++ b/devtools/client/debugger/debugger.xul
@@ -16,17 +16,17 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         macanimationtype="document"
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="960" height="480"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="text/javascript" src="debugger-controller.js"/>
   <script type="text/javascript" src="debugger-view.js"/>
   <script type="text/javascript" src="utils.js"/>
   <script type="text/javascript" src="views/workers-view.js"/>
   <script type="text/javascript" src="views/variable-bubble-view.js"/>
   <script type="text/javascript" src="views/watch-expressions-view.js"/>
--- a/devtools/client/debugger/new/debugger.js
+++ b/devtools/client/debugger/new/debugger.js
@@ -2048,67 +2048,67 @@ var Debugger =
 	});
 
 
 /***/ },
 /* 32 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* This Source Code Form is subject to the terms of the Mozilla Public
-	 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
-	 * You can obtain one at http://mozilla.org/MPL/2.0/. */
-	
-	const React = __webpack_require__(2);
-	const ReactDOM = __webpack_require__(31);
-	const { DOM: dom, PropTypes } = React;
-	
-	const Draggable = React.createClass({
-	  displayName: "Draggable",
-	
-	  propTypes: {
-	    onMove: PropTypes.func.isRequired,
-	    onStart: PropTypes.func,
-	    onStop: PropTypes.func,
-	    style: PropTypes.object,
-	    className: PropTypes.string
-	  },
-	
-	  startDragging(ev) {
-	    ev.preventDefault();
-	    const doc = ReactDOM.findDOMNode(this).ownerDocument;
-	    doc.addEventListener("mousemove", this.onMove);
-	    doc.addEventListener("mouseup", this.onUp);
-	    this.props.onStart && this.props.onStart();
-	  },
-	
-	  onMove(ev) {
-	    ev.preventDefault();
-	    // Use screen coordinates so, moving mouse over iframes
-	    // doesn't mangle (relative) coordinates.
-	    this.props.onMove(ev.screenX, ev.screenY);
-	  },
-	
-	  onUp(ev) {
-	    ev.preventDefault();
-	    const doc = ReactDOM.findDOMNode(this).ownerDocument;
-	    doc.removeEventListener("mousemove", this.onMove);
-	    doc.removeEventListener("mouseup", this.onUp);
-	    this.props.onStop && this.props.onStop();
-	  },
-	
-	  render() {
-	    return dom.div({
-	      style: this.props.style,
-	      className: this.props.className,
-	      onMouseDown: this.startDragging
-	    });
-	  }
-	});
-	
-	module.exports = Draggable;
+	 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+	 * You can obtain one at http://mozilla.org/MPL/2.0/. */
+	
+	const React = __webpack_require__(2);
+	const ReactDOM = __webpack_require__(31);
+	const { DOM: dom, PropTypes } = React;
+	
+	const Draggable = React.createClass({
+	  displayName: "Draggable",
+	
+	  propTypes: {
+	    onMove: PropTypes.func.isRequired,
+	    onStart: PropTypes.func,
+	    onStop: PropTypes.func,
+	    style: PropTypes.object,
+	    className: PropTypes.string
+	  },
+	
+	  startDragging(ev) {
+	    ev.preventDefault();
+	    const doc = ReactDOM.findDOMNode(this).ownerDocument;
+	    doc.addEventListener("mousemove", this.onMove);
+	    doc.addEventListener("mouseup", this.onUp);
+	    this.props.onStart && this.props.onStart();
+	  },
+	
+	  onMove(ev) {
+	    ev.preventDefault();
+	    // Use screen coordinates so, moving mouse over iframes
+	    // doesn't mangle (relative) coordinates.
+	    this.props.onMove(ev.screenX, ev.screenY);
+	  },
+	
+	  onUp(ev) {
+	    ev.preventDefault();
+	    const doc = ReactDOM.findDOMNode(this).ownerDocument;
+	    doc.removeEventListener("mousemove", this.onMove);
+	    doc.removeEventListener("mouseup", this.onUp);
+	    this.props.onStop && this.props.onStop();
+	  },
+	
+	  render() {
+	    return dom.div({
+	      style: this.props.style,
+	      className: this.props.className,
+	      onMouseDown: this.startDragging
+	    });
+	  }
+	});
+	
+	module.exports = Draggable;
 
 
 /***/ },
 /* 33 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
 	 * Copyright (c) 2007-2016, Alexandru Marasteanu <hello [at) alexei (dot] ro>
@@ -10061,26 +10061,26 @@ var Debugger =
 	}(this));
 	
 	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(51)(module), (function() { return this; }())))
 
 /***/ },
 /* 51 */
 /***/ function(module, exports) {
 
-	module.exports = function(module) {
-		if(!module.webpackPolyfill) {
-			module.deprecate = function() {};
-			module.paths = [];
-			// module.parent = undefined by default
-			module.children = [];
-			module.webpackPolyfill = 1;
-		}
-		return module;
-	}
+	module.exports = function(module) {
+		if(!module.webpackPolyfill) {
+			module.deprecate = function() {};
+			module.paths = [];
+			// module.parent = undefined by default
+			module.children = [];
+			module.webpackPolyfill = 1;
+		}
+		return module;
+	}
 
 
 /***/ },
 /* 52 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {/*! https://mths.be/utf8js v2.0.0 by @mathias */
 	;(function(root) {
@@ -53144,176 +53144,176 @@ var Debugger =
 	module.exports = {
 	  originalToGeneratedId, generatedToOriginalId, isOriginalId, isGeneratedId
 	};
 
 /***/ },
 /* 318 */
 /***/ function(module, exports, __webpack_require__) {
 
-	(function(){
-	  var crypt = __webpack_require__(319),
-	      utf8 = __webpack_require__(320).utf8,
-	      isBuffer = __webpack_require__(321),
-	      bin = __webpack_require__(320).bin,
-	
-	  // The core
-	  md5 = function (message, options) {
-	    // Convert to byte array
-	    if (message.constructor == String)
-	      if (options && options.encoding === 'binary')
-	        message = bin.stringToBytes(message);
-	      else
-	        message = utf8.stringToBytes(message);
-	    else if (isBuffer(message))
-	      message = Array.prototype.slice.call(message, 0);
-	    else if (!Array.isArray(message))
-	      message = message.toString();
-	    // else, assume byte array already
-	
-	    var m = crypt.bytesToWords(message),
-	        l = message.length * 8,
-	        a =  1732584193,
-	        b = -271733879,
-	        c = -1732584194,
-	        d =  271733878;
-	
-	    // Swap endian
-	    for (var i = 0; i < m.length; i++) {
-	      m[i] = ((m[i] <<  8) | (m[i] >>> 24)) & 0x00FF00FF |
-	             ((m[i] << 24) | (m[i] >>>  8)) & 0xFF00FF00;
-	    }
-	
-	    // Padding
-	    m[l >>> 5] |= 0x80 << (l % 32);
-	    m[(((l + 64) >>> 9) << 4) + 14] = l;
-	
-	    // Method shortcuts
-	    var FF = md5._ff,
-	        GG = md5._gg,
-	        HH = md5._hh,
-	        II = md5._ii;
-	
-	    for (var i = 0; i < m.length; i += 16) {
-	
-	      var aa = a,
-	          bb = b,
-	          cc = c,
-	          dd = d;
-	
-	      a = FF(a, b, c, d, m[i+ 0],  7, -680876936);
-	      d = FF(d, a, b, c, m[i+ 1], 12, -389564586);
-	      c = FF(c, d, a, b, m[i+ 2], 17,  606105819);
-	      b = FF(b, c, d, a, m[i+ 3], 22, -1044525330);
-	      a = FF(a, b, c, d, m[i+ 4],  7, -176418897);
-	      d = FF(d, a, b, c, m[i+ 5], 12,  1200080426);
-	      c = FF(c, d, a, b, m[i+ 6], 17, -1473231341);
-	      b = FF(b, c, d, a, m[i+ 7], 22, -45705983);
-	      a = FF(a, b, c, d, m[i+ 8],  7,  1770035416);
-	      d = FF(d, a, b, c, m[i+ 9], 12, -1958414417);
-	      c = FF(c, d, a, b, m[i+10], 17, -42063);
-	      b = FF(b, c, d, a, m[i+11], 22, -1990404162);
-	      a = FF(a, b, c, d, m[i+12],  7,  1804603682);
-	      d = FF(d, a, b, c, m[i+13], 12, -40341101);
-	      c = FF(c, d, a, b, m[i+14], 17, -1502002290);
-	      b = FF(b, c, d, a, m[i+15], 22,  1236535329);
-	
-	      a = GG(a, b, c, d, m[i+ 1],  5, -165796510);
-	      d = GG(d, a, b, c, m[i+ 6],  9, -1069501632);
-	      c = GG(c, d, a, b, m[i+11], 14,  643717713);
-	      b = GG(b, c, d, a, m[i+ 0], 20, -373897302);
-	      a = GG(a, b, c, d, m[i+ 5],  5, -701558691);
-	      d = GG(d, a, b, c, m[i+10],  9,  38016083);
-	      c = GG(c, d, a, b, m[i+15], 14, -660478335);
-	      b = GG(b, c, d, a, m[i+ 4], 20, -405537848);
-	      a = GG(a, b, c, d, m[i+ 9],  5,  568446438);
-	      d = GG(d, a, b, c, m[i+14],  9, -1019803690);
-	      c = GG(c, d, a, b, m[i+ 3], 14, -187363961);
-	      b = GG(b, c, d, a, m[i+ 8], 20,  1163531501);
-	      a = GG(a, b, c, d, m[i+13],  5, -1444681467);
-	      d = GG(d, a, b, c, m[i+ 2],  9, -51403784);
-	      c = GG(c, d, a, b, m[i+ 7], 14,  1735328473);
-	      b = GG(b, c, d, a, m[i+12], 20, -1926607734);
-	
-	      a = HH(a, b, c, d, m[i+ 5],  4, -378558);
-	      d = HH(d, a, b, c, m[i+ 8], 11, -2022574463);
-	      c = HH(c, d, a, b, m[i+11], 16,  1839030562);
-	      b = HH(b, c, d, a, m[i+14], 23, -35309556);
-	      a = HH(a, b, c, d, m[i+ 1],  4, -1530992060);
-	      d = HH(d, a, b, c, m[i+ 4], 11,  1272893353);
-	      c = HH(c, d, a, b, m[i+ 7], 16, -155497632);
-	      b = HH(b, c, d, a, m[i+10], 23, -1094730640);
-	      a = HH(a, b, c, d, m[i+13],  4,  681279174);
-	      d = HH(d, a, b, c, m[i+ 0], 11, -358537222);
-	      c = HH(c, d, a, b, m[i+ 3], 16, -722521979);
-	      b = HH(b, c, d, a, m[i+ 6], 23,  76029189);
-	      a = HH(a, b, c, d, m[i+ 9],  4, -640364487);
-	      d = HH(d, a, b, c, m[i+12], 11, -421815835);
-	      c = HH(c, d, a, b, m[i+15], 16,  530742520);
-	      b = HH(b, c, d, a, m[i+ 2], 23, -995338651);
-	
-	      a = II(a, b, c, d, m[i+ 0],  6, -198630844);
-	      d = II(d, a, b, c, m[i+ 7], 10,  1126891415);
-	      c = II(c, d, a, b, m[i+14], 15, -1416354905);
-	      b = II(b, c, d, a, m[i+ 5], 21, -57434055);
-	      a = II(a, b, c, d, m[i+12],  6,  1700485571);
-	      d = II(d, a, b, c, m[i+ 3], 10, -1894986606);
-	      c = II(c, d, a, b, m[i+10], 15, -1051523);
-	      b = II(b, c, d, a, m[i+ 1], 21, -2054922799);
-	      a = II(a, b, c, d, m[i+ 8],  6,  1873313359);
-	      d = II(d, a, b, c, m[i+15], 10, -30611744);
-	      c = II(c, d, a, b, m[i+ 6], 15, -1560198380);
-	      b = II(b, c, d, a, m[i+13], 21,  1309151649);
-	      a = II(a, b, c, d, m[i+ 4],  6, -145523070);
-	      d = II(d, a, b, c, m[i+11], 10, -1120210379);
-	      c = II(c, d, a, b, m[i+ 2], 15,  718787259);
-	      b = II(b, c, d, a, m[i+ 9], 21, -343485551);
-	
-	      a = (a + aa) >>> 0;
-	      b = (b + bb) >>> 0;
-	      c = (c + cc) >>> 0;
-	      d = (d + dd) >>> 0;
-	    }
-	
-	    return crypt.endian([a, b, c, d]);
-	  };
-	
-	  // Auxiliary functions
-	  md5._ff  = function (a, b, c, d, x, s, t) {
-	    var n = a + (b & c | ~b & d) + (x >>> 0) + t;
-	    return ((n << s) | (n >>> (32 - s))) + b;
-	  };
-	  md5._gg  = function (a, b, c, d, x, s, t) {
-	    var n = a + (b & d | c & ~d) + (x >>> 0) + t;
-	    return ((n << s) | (n >>> (32 - s))) + b;
-	  };
-	  md5._hh  = function (a, b, c, d, x, s, t) {
-	    var n = a + (b ^ c ^ d) + (x >>> 0) + t;
-	    return ((n << s) | (n >>> (32 - s))) + b;
-	  };
-	  md5._ii  = function (a, b, c, d, x, s, t) {
-	    var n = a + (c ^ (b | ~d)) + (x >>> 0) + t;
-	    return ((n << s) | (n >>> (32 - s))) + b;
-	  };
-	
-	  // Package private blocksize
-	  md5._blocksize = 16;
-	  md5._digestsize = 16;
-	
-	  module.exports = function (message, options) {
-	    if (message === undefined || message === null)
-	      throw new Error('Illegal argument ' + message);
-	
-	    var digestbytes = crypt.wordsToBytes(md5(message, options));
-	    return options && options.asBytes ? digestbytes :
-	        options && options.asString ? bin.bytesToString(digestbytes) :
-	        crypt.bytesToHex(digestbytes);
-	  };
-	
-	})();
+	(function(){
+	  var crypt = __webpack_require__(319),
+	      utf8 = __webpack_require__(320).utf8,
+	      isBuffer = __webpack_require__(321),
+	      bin = __webpack_require__(320).bin,
+	
+	  // The core
+	  md5 = function (message, options) {
+	    // Convert to byte array
+	    if (message.constructor == String)
+	      if (options && options.encoding === 'binary')
+	        message = bin.stringToBytes(message);
+	      else
+	        message = utf8.stringToBytes(message);
+	    else if (isBuffer(message))
+	      message = Array.prototype.slice.call(message, 0);
+	    else if (!Array.isArray(message))
+	      message = message.toString();
+	    // else, assume byte array already
+	
+	    var m = crypt.bytesToWords(message),
+	        l = message.length * 8,
+	        a =  1732584193,
+	        b = -271733879,
+	        c = -1732584194,
+	        d =  271733878;
+	
+	    // Swap endian
+	    for (var i = 0; i < m.length; i++) {
+	      m[i] = ((m[i] <<  8) | (m[i] >>> 24)) & 0x00FF00FF |
+	             ((m[i] << 24) | (m[i] >>>  8)) & 0xFF00FF00;
+	    }
+	
+	    // Padding
+	    m[l >>> 5] |= 0x80 << (l % 32);
+	    m[(((l + 64) >>> 9) << 4) + 14] = l;
+	
+	    // Method shortcuts
+	    var FF = md5._ff,
+	        GG = md5._gg,
+	        HH = md5._hh,
+	        II = md5._ii;
+	
+	    for (var i = 0; i < m.length; i += 16) {
+	
+	      var aa = a,
+	          bb = b,
+	          cc = c,
+	          dd = d;
+	
+	      a = FF(a, b, c, d, m[i+ 0],  7, -680876936);
+	      d = FF(d, a, b, c, m[i+ 1], 12, -389564586);
+	      c = FF(c, d, a, b, m[i+ 2], 17,  606105819);
+	      b = FF(b, c, d, a, m[i+ 3], 22, -1044525330);
+	      a = FF(a, b, c, d, m[i+ 4],  7, -176418897);
+	      d = FF(d, a, b, c, m[i+ 5], 12,  1200080426);
+	      c = FF(c, d, a, b, m[i+ 6], 17, -1473231341);
+	      b = FF(b, c, d, a, m[i+ 7], 22, -45705983);
+	      a = FF(a, b, c, d, m[i+ 8],  7,  1770035416);
+	      d = FF(d, a, b, c, m[i+ 9], 12, -1958414417);
+	      c = FF(c, d, a, b, m[i+10], 17, -42063);
+	      b = FF(b, c, d, a, m[i+11], 22, -1990404162);
+	      a = FF(a, b, c, d, m[i+12],  7,  1804603682);
+	      d = FF(d, a, b, c, m[i+13], 12, -40341101);
+	      c = FF(c, d, a, b, m[i+14], 17, -1502002290);
+	      b = FF(b, c, d, a, m[i+15], 22,  1236535329);
+	
+	      a = GG(a, b, c, d, m[i+ 1],  5, -165796510);
+	      d = GG(d, a, b, c, m[i+ 6],  9, -1069501632);
+	      c = GG(c, d, a, b, m[i+11], 14,  643717713);
+	      b = GG(b, c, d, a, m[i+ 0], 20, -373897302);
+	      a = GG(a, b, c, d, m[i+ 5],  5, -701558691);
+	      d = GG(d, a, b, c, m[i+10],  9,  38016083);
+	      c = GG(c, d, a, b, m[i+15], 14, -660478335);
+	      b = GG(b, c, d, a, m[i+ 4], 20, -405537848);
+	      a = GG(a, b, c, d, m[i+ 9],  5,  568446438);
+	      d = GG(d, a, b, c, m[i+14],  9, -1019803690);
+	      c = GG(c, d, a, b, m[i+ 3], 14, -187363961);
+	      b = GG(b, c, d, a, m[i+ 8], 20,  1163531501);
+	      a = GG(a, b, c, d, m[i+13],  5, -1444681467);
+	      d = GG(d, a, b, c, m[i+ 2],  9, -51403784);
+	      c = GG(c, d, a, b, m[i+ 7], 14,  1735328473);
+	      b = GG(b, c, d, a, m[i+12], 20, -1926607734);
+	
+	      a = HH(a, b, c, d, m[i+ 5],  4, -378558);
+	      d = HH(d, a, b, c, m[i+ 8], 11, -2022574463);
+	      c = HH(c, d, a, b, m[i+11], 16,  1839030562);
+	      b = HH(b, c, d, a, m[i+14], 23, -35309556);
+	      a = HH(a, b, c, d, m[i+ 1],  4, -1530992060);
+	      d = HH(d, a, b, c, m[i+ 4], 11,  1272893353);
+	      c = HH(c, d, a, b, m[i+ 7], 16, -155497632);
+	      b = HH(b, c, d, a, m[i+10], 23, -1094730640);
+	      a = HH(a, b, c, d, m[i+13],  4,  681279174);
+	      d = HH(d, a, b, c, m[i+ 0], 11, -358537222);
+	      c = HH(c, d, a, b, m[i+ 3], 16, -722521979);
+	      b = HH(b, c, d, a, m[i+ 6], 23,  76029189);
+	      a = HH(a, b, c, d, m[i+ 9],  4, -640364487);
+	      d = HH(d, a, b, c, m[i+12], 11, -421815835);
+	      c = HH(c, d, a, b, m[i+15], 16,  530742520);
+	      b = HH(b, c, d, a, m[i+ 2], 23, -995338651);
+	
+	      a = II(a, b, c, d, m[i+ 0],  6, -198630844);
+	      d = II(d, a, b, c, m[i+ 7], 10,  1126891415);
+	      c = II(c, d, a, b, m[i+14], 15, -1416354905);
+	      b = II(b, c, d, a, m[i+ 5], 21, -57434055);
+	      a = II(a, b, c, d, m[i+12],  6,  1700485571);
+	      d = II(d, a, b, c, m[i+ 3], 10, -1894986606);
+	      c = II(c, d, a, b, m[i+10], 15, -1051523);
+	      b = II(b, c, d, a, m[i+ 1], 21, -2054922799);
+	      a = II(a, b, c, d, m[i+ 8],  6,  1873313359);
+	      d = II(d, a, b, c, m[i+15], 10, -30611744);
+	      c = II(c, d, a, b, m[i+ 6], 15, -1560198380);
+	      b = II(b, c, d, a, m[i+13], 21,  1309151649);
+	      a = II(a, b, c, d, m[i+ 4],  6, -145523070);
+	      d = II(d, a, b, c, m[i+11], 10, -1120210379);
+	      c = II(c, d, a, b, m[i+ 2], 15,  718787259);
+	      b = II(b, c, d, a, m[i+ 9], 21, -343485551);
+	
+	      a = (a + aa) >>> 0;
+	      b = (b + bb) >>> 0;
+	      c = (c + cc) >>> 0;
+	      d = (d + dd) >>> 0;
+	    }
+	
+	    return crypt.endian([a, b, c, d]);
+	  };
+	
+	  // Auxiliary functions
+	  md5._ff  = function (a, b, c, d, x, s, t) {
+	    var n = a + (b & c | ~b & d) + (x >>> 0) + t;
+	    return ((n << s) | (n >>> (32 - s))) + b;
+	  };
+	  md5._gg  = function (a, b, c, d, x, s, t) {
+	    var n = a + (b & d | c & ~d) + (x >>> 0) + t;
+	    return ((n << s) | (n >>> (32 - s))) + b;
+	  };
+	  md5._hh  = function (a, b, c, d, x, s, t) {
+	    var n = a + (b ^ c ^ d) + (x >>> 0) + t;
+	    return ((n << s) | (n >>> (32 - s))) + b;
+	  };
+	  md5._ii  = function (a, b, c, d, x, s, t) {
+	    var n = a + (c ^ (b | ~d)) + (x >>> 0) + t;
+	    return ((n << s) | (n >>> (32 - s))) + b;
+	  };
+	
+	  // Package private blocksize
+	  md5._blocksize = 16;
+	  md5._digestsize = 16;
+	
+	  module.exports = function (message, options) {
+	    if (message === undefined || message === null)
+	      throw new Error('Illegal argument ' + message);
+	
+	    var digestbytes = crypt.wordsToBytes(md5(message, options));
+	    return options && options.asBytes ? digestbytes :
+	        options && options.asString ? bin.bytesToString(digestbytes) :
+	        crypt.bytesToHex(digestbytes);
+	  };
+	
+	})();
 
 
 /***/ },
 /* 319 */
 /***/ function(module, exports) {
 
 	(function() {
 	  var base64map
--- a/devtools/client/debugger/new/index.html
+++ b/devtools/client/debugger/new/index.html
@@ -12,17 +12,17 @@
           href="chrome://devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css" />
     <link rel="stylesheet"
           type="text/css"
           href="chrome://devtools/content/sourceeditor/codemirror/mozilla.css" />
     <link rel="stylesheet" type="text/css" href="resource://devtools/client/debugger/new/debugger.css" />
   </head>
   <body>
     <div id="mount"></div>
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="chrome://devtools/content/shared/theme-switching.js"></script>
     <script type="text/javascript">
       const { BrowserLoader } = Components.utils.import("resource://devtools/client/shared/browser-loader.js", {});
       const { require: devtoolsRequire } = BrowserLoader({
         baseURI: "resource://devtools/client/debugger/new/",
         window,
       });
     </script>
--- a/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
@@ -14,17 +14,17 @@ function test() {
     "<!doctype html>",
     "<head>",
     "<SCRIPT>",
     "let a + 42;",
     "</SCRIPT>",
     "<script type='text/javascript'>",
     "let b = 42;",
     "</SCRIPT>",
-    "<script type='text/javascript;version=1.8'>",
+    "<script type='text/javascript'>",
     "let c + 42;",
     "</SCRIPT>",
     "</head>"
   ].join("\n");
   let parser = new Parser();
   // Don't pollute the logs with exceptions that we are going to check anyhow.
   parser.logExceptions = false;
   let parsed = parser.get(source);
--- a/devtools/client/debugger/test/mochitest/doc_cmd-dbg.html
+++ b/devtools/client/debugger/test/mochitest/doc_cmd-dbg.html
@@ -7,17 +7,17 @@
     <meta charset="utf-8"/>
     <title>Debugger test page</title>
   </head>
 
   <body>
     <input type="text" value=""/>
     <input type="button" value="Click me!" onclick="test()"/>
 
-    <script type="application/javascript;version=1.7">
+    <script type="application/javascript">
       let output = document.querySelector("input");
       output.value = "";
 
       function test() {
         debugger;
         stepIntoMe();               // step in
 
         output.value = "dbg continue";
--- a/devtools/client/debugger/test/mochitest/doc_function-search.html
+++ b/devtools/client/debugger/test/mochitest/doc_function-search.html
@@ -10,17 +10,17 @@
 
   <body>
     <p>Peanut butter jelly time!</p>
 
     <script type="text/javascript" src="code_function-search-01.js"></script>
     <script type="text/javascript" src="code_function-search-02.js"></script>
     <script type="text/javascript" src="code_function-search-03.js"></script>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       function inline() {}
       var arrow = () => {}
 
       var foo = bar => {}
       var foo2 = bar2 = baz2 => 42;
 
       setTimeout((foo, bar, baz) => {});
       setTimeout((foo, bar, baz) => 42);
--- a/devtools/client/dom/dom.html
+++ b/devtools/client/dom/dom.html
@@ -6,16 +6,16 @@
 <html dir="">
 <head>
   <meta charset="utf-8"/>
 
   <link href="resource://devtools/client/dom/content/dom-view.css" rel="stylesheet" />
   <link href="resource://devtools/client/jsonview/css/toolbar.css" rel="stylesheet" />
   <link href="resource://devtools/client/shared/components/tree/tree-view.css" rel="stylesheet" />
 
-  <script type="text/javascript;version=1.8"
+  <script type="text/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"></script>
 </head>
 <body class="theme-body devtools-monospace" role="application">
   <div id="content"></div>
   <script type="text/javascript" src="./main.js"></script>
 </body>
 </html>
--- a/devtools/client/framework/connect/connect.xhtml
+++ b/devtools/client/framework/connect/connect.xhtml
@@ -11,17 +11,17 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&title;</title>
     <link rel="stylesheet" href="chrome://devtools/skin/dark-theme.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/connect/connect.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="connect.js"></script>
+    <script type="application/javascript" src="connect.js"></script>
   </head>
   <body>
     <h1>&header;</h1>
     <section id="connection-form">
       <form validate="validate" action="#">
         <label>
           <span>&host;</span>
           <input required="required" class="devtools-textinput" id="host" type="text"></input>
--- a/devtools/client/framework/test/browser_toolbox_options_disable_js.html
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_js.html
@@ -15,17 +15,17 @@
         height: 90px;
         border: 1px solid #000;
       }
 
       h1 {
         font-size: 20px
       }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       function log(msg) {
         let output = document.getElementById("output");
 
         output.innerHTML = msg;
       }
     </script>
   </head>
   <body>
--- a/devtools/client/framework/test/browser_toolbox_options_disable_js_iframe.html
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_js_iframe.html
@@ -5,17 +5,17 @@
     <style>
       div {
         width: 260px;
         height: 24px;
         border: 1px solid #000;
         margin-top: 10px;
       }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       function log(msg) {
         let output = document.getElementById("output");
 
         output.innerHTML = msg;
       }
     </script>
   </head>
   <body>
--- a/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
   <box flex="1" class="devtools-responsive-container theme-body">
     <vbox flex="1" class="devtools-main-content" id="content">test</vbox>
     <splitter class="devtools-side-splitter"/>
     <tabbox flex="1" id="sidebar" class="devtools-sidebar-tabs">
       <tabs/>
       <tabpanels flex="1"/>
     </tabbox>
   </box>
--- a/devtools/client/framework/toolbox-options.xhtml
+++ b/devtools/client/framework/toolbox-options.xhtml
@@ -6,17 +6,17 @@
 <!ENTITY % toolboxDTD SYSTEM "chrome://devtools/locale/toolbox.dtd" >
  %toolboxDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml" dir="">
   <head>
     <title>Toolbox option</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/options-panel.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
+    <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body role="application" class="theme-body">
   <form id="options-panel">
     <div id="tools-box" class="options-vertical-pane">
       <fieldset id="default-tools-box" class="options-groupbox">
         <legend>&options.selectDefaultTools.label2;</legend>
       </fieldset>
 
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -15,23 +15,23 @@
 %editMenuStrings;
 <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">
 %globalKeysDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <script type="application/javascript"
           src="chrome://global/content/viewSourceUtils.js"/>
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/framework/toolbox-init.js"/>
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>
 
   <popupset>
     <menupopup id="toolbox-textbox-context-popup">
       <menuitem id="cMenu_undo"/>
--- a/devtools/client/inspector/inspector.xhtml
+++ b/devtools/client/inspector/inspector.xhtml
@@ -19,31 +19,31 @@
   <link rel="stylesheet" href="resource://devtools/client/shared/components/sidebar-toggle.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/tabs.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/tabbar.css"/>
   <link rel="stylesheet" href="resource://devtools/client/inspector/components/inspector-tab-panel.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/splitter/split-box.css"/>
   <link rel="stylesheet" href="resource://devtools/client/inspector/layout/components/Accordion.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/reps/reps.css"/>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"></script>
   <script type="text/javascript">
     /* eslint-disable */
     var isInChrome = window.location.href.includes("chrome:");
     if (isInChrome) {
       var exports = {};
       var Cu = Components.utils;
       var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
       var { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
     }
   </script>
 
   <!-- in content, inspector.js is mapped to the dynamically generated webpack bundle -->
-  <script type="application/javascript;version=1.8" src="inspector.js" defer="true"></script>
+  <script type="application/javascript" src="inspector.js" defer="true"></script>
 </head>
 <body class="theme-body" role="application">
   <div class="inspector-responsive-container theme-body inspector">
 
     <!-- Main Panel Content -->
     <div id="inspector-main-content" class="devtools-main-content">
       <div id="inspector-toolbar" class="devtools-toolbar" nowindowdrag="true"
                 data-localization-bundle="devtools/client/locales/inspector.properties">
--- a/devtools/client/inspector/markup/markup.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -7,19 +7,19 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/skin/markup.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/sourceeditor/codemirror/lib/codemirror.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/sourceeditor/codemirror/mozilla.css" type="text/css"/>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"></script>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/sourceeditor/codemirror/codemirror.bundle.js"></script>
 </head>
 <body class="theme-body devtools-monospace" role="application">
 
 <!-- NOTE THAT WE MAKE EXTENSIVE USE OF HTML COMMENTS IN THIS FILE IN ORDER -->
 <!-- TO MAKE SPANS READABLE WHILST AVOIDING SIGNIFICANT WHITESPACE          -->
 
   <div id="root-wrapper" role="presentation">
--- a/devtools/client/inspector/markup/test/doc_markup_events_01.html
+++ b/devtools/client/inspector/markup/test/doc_markup_events_01.html
@@ -23,17 +23,17 @@
     #noevents {
       cursor: auto;
     }
 
     #output {
       min-height: 1.5em;
     }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       function init() {
         let container = document.getElementById("container");
         let multiple = document.getElementById("multiple");
 
         container.addEventListener("mouseover", mouseoverHandler, true);
         multiple.addEventListener("click", clickHandler, false);
         multiple.addEventListener("mouseup", mouseupHandler, false);
 
--- a/devtools/client/inspector/markup/test/doc_markup_events_02.html
+++ b/devtools/client/inspector/markup/test/doc_markup_events_02.html
@@ -11,17 +11,17 @@
     #anon-object-method,
     #object-method {
       border: 1px solid #000;
       width: 200px;
       min-height: 1em;
       cursor: pointer;
     }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       function init() {
         let fatarrow = document.getElementById("fatarrow");
 
         let he = new handleEventClick();
         let anonObjectMethod = document.getElementById("anon-object-method");
         anonObjectMethod.addEventListener("click", he.anonObjectMethod);
 
         let objectMethod = document.getElementById("object-method");
--- a/devtools/client/inspector/markup/test/doc_markup_events_03.html
+++ b/devtools/client/inspector/markup/test/doc_markup_events_03.html
@@ -10,17 +10,17 @@
     #anon-function-expression,
     #returned-function {
       border: 1px solid #000;
       width: 200px;
       min-height: 1em;
       cursor: pointer;
     }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       let namedFunctionExpression =
       function foo() {
         alert("namedFunctionExpression");
       }
 
       let anonFunctionExpression = function() {
         alert("anonFunctionExpression");
       };
--- a/devtools/client/inspector/markup/test/doc_markup_events_04.html
+++ b/devtools/client/inspector/markup/test/doc_markup_events_04.html
@@ -10,17 +10,17 @@
     #arraysort,
     #handleEvent {
       border: 1px solid #000;
       width: 200px;
       min-height: 1em;
       cursor: pointer;
     }
     </style>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       let constructedFunc = new Function();
 
       let constructedFuncWithBodyString =
         new Function('a', 'b', 'c', 'alert("constructedFuncWithBodyString");');
 
       let multipleAssignment = foo = bar = function multi() {
         alert("multipleAssignment");
       }
--- a/devtools/client/inspector/markup/test/doc_markup_events_jquery.html
+++ b/devtools/client/inspector/markup/test/doc_markup_events_jquery.html
@@ -10,17 +10,17 @@
 
       div {
         width: 100px;
         height: 100px;
         border: 1px solid #000;
       }
     </style>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       let jq = document.location.search.substr(1);
 
       let script = document.createElement("script");
       script.setAttribute("type", "text/javascript");
       script.setAttribute("src", jq);
 
       document.head.appendChild(script);
 
--- a/devtools/client/inspector/rules/test/doc_media_queries.html
+++ b/devtools/client/inspector/rules/test/doc_media_queries.html
@@ -1,12 +1,12 @@
 <html>
 <head>
   <title>test</title>
-  <script type="application/javascript;version=1.7">
+  <script type="application/javascript">
 
   </script>
   <style>
     div {
       width: 1000px;
       height: 100px;
       background-color: #f00;
     }
--- a/devtools/client/memory/memory.xhtml
+++ b/devtools/client/memory/memory.xhtml
@@ -14,22 +14,22 @@
     <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/memory.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/components-frame.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/components-h-split-box.css" type="text/css"/>
   </head>
   <body class="theme-body">
     <div id="app"></div>
 
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="chrome://devtools/content/shared/theme-switching.js"
             defer="true">
     </script>
 
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="initializer.js"
             defer="true">
     </script>
 
     <script type="application/javascript"
             src="chrome://devtools/content/shared/vendor/d3.js"
             defer="true">
     </script>
--- a/devtools/client/memory/test/chrome/test_CensusTreeItem_01.html
+++ b/devtools/client/memory/test/chrome/test_CensusTreeItem_01.html
@@ -9,18 +9,18 @@ Test that children pointers show up at t
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(CensusTreeItem(immutableUpdate(TEST_CENSUS_TREE_ITEM_PROPS, {
                inverted: true,
                depth: 0,
              })), container);
--- a/devtools/client/memory/test/chrome/test_DominatorTreeItem_01.html
+++ b/devtools/client/memory/test/chrome/test_DominatorTreeItem_01.html
@@ -9,18 +9,18 @@ Test that we don't display `JS::ubi::Roo
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(DominatorTreeItem({
                item: makeTestDominatorTreeNode({ label: ["other", "JS::ubi::RootList"] }),
                depth: 0,
                arrow: React.DOM.div(),
--- a/devtools/client/memory/test/chrome/test_DominatorTree_01.html
+++ b/devtools/client/memory/test/chrome/test_DominatorTree_01.html
@@ -9,18 +9,18 @@ Test that we show a place holder for a s
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              const root = makeTestDominatorTreeNode({ moreChildrenAvailable: true});
              ok(!root.children);
 
              const expanded = new Set();
--- a/devtools/client/memory/test/chrome/test_DominatorTree_02.html
+++ b/devtools/client/memory/test/chrome/test_DominatorTree_02.html
@@ -9,18 +9,18 @@ Test that we show a link to load more ch
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              const root = makeTestDominatorTreeNode({ moreChildrenAvailable: true }, [
                makeTestDominatorTreeNode({}),
              ]);
              ok(root.children);
--- a/devtools/client/memory/test/chrome/test_DominatorTree_03.html
+++ b/devtools/client/memory/test/chrome/test_DominatorTree_03.html
@@ -9,18 +9,18 @@ Test that expanded DominatorTreeItems ar
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
         window.onload = Task.async(function* () {
           try {
             const container = document.getElementById("container");
 
             // simple tree with one root and one child
             const root = makeTestDominatorTreeNode(
               { moreChildrenAvailable: false },
               [
--- a/devtools/client/memory/test/chrome/test_Heap_01.html
+++ b/devtools/client/memory/test/chrome/test_Heap_01.html
@@ -7,19 +7,19 @@ Test that rendering a dominator tree err
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
+        <script src="head.js" type="application/javascript"></script>
 
-        <script type="application/javascript;version=1.8">
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              ok(React, "Should get React");
              ok(Heap, "Should get Heap");
 
              const errorMessage = "Something went wrong!";
              const container = document.getElementById("container");
 
--- a/devtools/client/memory/test/chrome/test_Heap_02.html
+++ b/devtools/client/memory/test/chrome/test_Heap_02.html
@@ -7,18 +7,18 @@ Test that the currently selected view is
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              ok(React, "Should get React");
              ok(Heap, "Should get Heap");
 
              const errorMessage = "Something went wrong!";
              const container = document.getElementById("container");
 
--- a/devtools/client/memory/test/chrome/test_Heap_03.html
+++ b/devtools/client/memory/test/chrome/test_Heap_03.html
@@ -8,18 +8,18 @@ but not in other dominator tree states.
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              for (let state of [dominatorTreeState.COMPUTING, dominatorTreeState.FETCHING]) {
                yield renderComponent(Heap(immutableUpdate(TEST_HEAP_PROPS, {
                  view: { state: viewState.DOMINATOR_TREE, },
                  snapshot: immutableUpdate(TEST_HEAP_PROPS.snapshot, {
--- a/devtools/client/memory/test/chrome/test_Heap_04.html
+++ b/devtools/client/memory/test/chrome/test_Heap_04.html
@@ -7,18 +7,18 @@ Test that we show the "hey you're not re
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(Heap(immutableUpdate(TEST_HEAP_PROPS, {
                snapshot: immutableUpdate(TEST_HEAP_PROPS.snapshot, {
                  census: immutableUpdate(TEST_HEAP_PROPS.snapshot.census, {
                    report: {
--- a/devtools/client/memory/test/chrome/test_Heap_05.html
+++ b/devtools/client/memory/test/chrome/test_Heap_05.html
@@ -7,18 +7,18 @@ Test that we show a message when the cen
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(Heap(immutableUpdate(TEST_HEAP_PROPS, {
                snapshot: immutableUpdate(TEST_HEAP_PROPS.snapshot, {
                  census: immutableUpdate(TEST_HEAP_PROPS.snapshot.census, {
                    report: {
--- a/devtools/client/memory/test/chrome/test_List_01.html
+++ b/devtools/client/memory/test/chrome/test_List_01.html
@@ -8,18 +8,18 @@ Test to verify the delete button calls t
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
           try {
             const container = document.getElementById("container");
 
             let deletedSnapshots = [];
 
             let snapshots = [ TEST_SNAPSHOT, TEST_SNAPSHOT, TEST_SNAPSHOT ]
               .map((snapshot, index) => immutableUpdate(snapshot, {
--- a/devtools/client/memory/test/chrome/test_ShortestPaths_01.html
+++ b/devtools/client/memory/test/chrome/test_ShortestPaths_01.html
@@ -16,18 +16,18 @@ Test that the ShortestPaths component pr
             src="chrome://devtools/content/shared/vendor/dagre-d3.js">
     </script>
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(ShortestPaths(TEST_SHORTEST_PATHS_PROPS), container);
 
              let found1 = false;
              let found2 = false;
--- a/devtools/client/memory/test/chrome/test_ShortestPaths_02.html
+++ b/devtools/client/memory/test/chrome/test_ShortestPaths_02.html
@@ -16,18 +16,18 @@ Test that the ShortestPaths component re
             src="chrome://devtools/content/shared/vendor/dagre-d3.js">
     </script>
 </head>
 <body>
     <!-- Give the container height so that the whole tree is rendered. -->
     <div id="container" style="height: 900px;"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              yield renderComponent(ShortestPaths(immutableUpdate(TEST_SHORTEST_PATHS_PROPS,
                                                                  { graph: null })),
                                    container);
 
--- a/devtools/client/memory/test/chrome/test_SnapshotListItem_01.html
+++ b/devtools/client/memory/test/chrome/test_SnapshotListItem_01.html
@@ -9,18 +9,18 @@ path.
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
 
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
           try {
             const container = document.getElementById("container");
 
             yield renderComponent(
               SnapshotListItem(TEST_SNAPSHOT_LIST_ITEM_PROPS),
               container
             );
--- a/devtools/client/memory/test/chrome/test_Toolbar_01.html
+++ b/devtools/client/memory/test/chrome/test_Toolbar_01.html
@@ -7,18 +7,18 @@ Test that the Toolbar component shows th
     <meta charset="utf-8">
     <title>Tree component test</title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
     <div id="container"></div>
     <pre id="test">
-        <script src="head.js" type="application/javascript;version=1.8"></script>
-        <script type="application/javascript;version=1.8">
+        <script src="head.js" type="application/javascript"></script>
+        <script type="application/javascript">
          window.onload = Task.async(function* () {
            try {
              const container = document.getElementById("container");
 
              // Census and dominator tree views.
 
              for (let view of [viewState.CENSUS, viewState.DOMINATOR_TREE]) {
                yield renderComponent(Toolbar(immutableUpdate(TEST_TOOLBAR_PROPS, {
--- a/devtools/client/memory/test/chrome/test_TreeMap_01.html
+++ b/devtools/client/memory/test/chrome/test_TreeMap_01.html
@@ -13,18 +13,18 @@ Test that the Tree Map correctly renders
             src="chrome://devtools/content/shared/vendor/d3.js">
     </script>
 </head>
 <body>
   <!-- Give the container height so that the whole tree is rendered. -->
   <div id="container" style="height: 900px;"></div>
 
   <pre id="test">
-    <script src="head.js" type="application/javascript;version=1.8"></script>
-    <script type="application/javascript;version=1.8">
+    <script src="head.js" type="application/javascript"></script>
+    <script type="application/javascript">
       window.onload = Task.async(function*() {
         try {
           const container = document.getElementById("container");
 
           yield renderComponent(TreeMap(TEST_TREE_MAP_PROPS), container);
 
           let treeMapContainer = container.querySelector(".tree-map-container");
           ok(treeMapContainer, "Component creates a container");
--- a/devtools/client/performance/components/test/test_jit_optimizations_01.html
+++ b/devtools/client/performance/components/test/test_jit_optimizations_01.html
@@ -6,18 +6,18 @@ Test the rendering of the JIT Optimizati
 <head>
   <meta charset="utf-8">
   <title>JITOptimizations component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body style="height: 10000px;">
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let JITOptimizations = React.createFactory(browserRequire("devtools/client/performance/components/jit-optimizations"));
     ok(JITOptimizations, "Should get JITOptimizations");
     let opts;
 
--- a/devtools/client/responsive.html/index.xhtml
+++ b/devtools/client/responsive.html/index.xhtml
@@ -3,17 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css"
           href="resource://devtools/client/responsive.html/index.css"/>
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="chrome://devtools/content/shared/theme-switching.js"></script>
-    <script type="application/javascript;version=1.8"
+    <script type="application/javascript"
             src="./index.js"></script>
   </head>
   <body class="theme-body" role="application">
     <div id="root"/>
   </body>
 </html>
--- a/devtools/client/responsive.html/test/browser/touch.html
+++ b/devtools/client/responsive.html/test/browser/touch.html
@@ -9,17 +9,17 @@
   div {
     border :1px solid red;
     width: 100px; height: 100px;
   }
 </style>
 
 <div data-is-delay="false"></div>
 
-<script type="text/javascript;version=1.8">
+<script type="text/javascript">
   "use strict";
   let div = document.querySelector("div");
   let initX, initY;
   let previousEvent = "", touchendTime = 0;
   let updatePreviousEvent = function (e) {
     previousEvent = e.type;
   };
 
--- a/devtools/client/scratchpad/scratchpad.xul
+++ b/devtools/client/scratchpad/scratchpad.xul
@@ -22,17 +22,17 @@
         title="&window.title;"
         windowtype="devtools:scratchpad"
         macanimationtype="document"
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="640" height="480"
         persist="screenX screenY width height sizemode">
 
-<script type="application/javascript;version=1.8"
+<script type="application/javascript"
         src="chrome://devtools/content/shared/theme-switching.js"/>
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://devtools/content/scratchpad/scratchpad.js"/>
 
 <commandset id="editMenuCommands"/>
 
 <commandset id="sourceEditorCommands">
   <command id="cmd_find" oncommand=";"/>
--- a/devtools/client/shadereditor/shadereditor.xul
+++ b/devtools/client/shadereditor/shadereditor.xul
@@ -8,17 +8,17 @@
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://devtools/locale/shadereditor.dtd">
   %debuggerDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
 
   <script type="application/javascript" src="shadereditor.js"/>
 
   <vbox class="theme-body" flex="1">
     <hbox id="reload-notice"
           class="notice-container"
           align="center"
--- a/devtools/client/shadereditor/test/doc_blended-geometry.html
+++ b/devtools/client/shadereditor/test/doc_blended-geometry.html
@@ -32,17 +32,17 @@
         gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
       }
     </script>
   </head>
 
   <body>
     <canvas id="canvas" width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
       let program = [];
       let squareVerticesPositionBuffer;
       let vertexPositionAttribute = [];
       let depthUniform = [];
 
--- a/devtools/client/shadereditor/test/doc_multiple-contexts.html
+++ b/devtools/client/shadereditor/test/doc_multiple-contexts.html
@@ -25,17 +25,17 @@
       }
     </script>
   </head>
 
   <body>
     <canvas id="canvas1" width="128" height="128"></canvas>
     <canvas id="canvas2" width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas = [], gl = [];
       let program = [];
       let squareVerticesPositionBuffer = [];
       let vertexPositionAttribute = [];
       let colorUniform = [];
 
--- a/devtools/client/shadereditor/test/doc_overlapping-geometry.html
+++ b/devtools/client/shadereditor/test/doc_overlapping-geometry.html
@@ -32,17 +32,17 @@
         gl_FragColor = vec4(0.0, 1.0, 1.0, 1.0);
       }
     </script>
   </head>
 
   <body>
     <canvas id="canvas" width="128" height="128"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
       let program = [];
       let squareVerticesPositionBuffer;
       let vertexPositionAttribute = [];
       let depthUniform = [];
 
--- a/devtools/client/shadereditor/test/doc_shader-order.html
+++ b/devtools/client/shadereditor/test/doc_shader-order.html
@@ -23,17 +23,17 @@
         gl_FragColor = vec4(1, 0, 0, 1); // I'm a fragment shader!
       }
     </script>
   </head>
 
   <body>
     <canvas width="512" height="512"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
 
       window.onload = function() {
         canvas = document.querySelector("canvas");
         gl = canvas.getContext("webgl", { preserveDrawingBuffer: true });
 
--- a/devtools/client/shadereditor/test/doc_simple-canvas.html
+++ b/devtools/client/shadereditor/test/doc_simple-canvas.html
@@ -27,17 +27,17 @@
         gl_FragColor = vec4(vFragmentColor, 1.0); // I'm also special!
       }
     </script>
   </head>
 
   <body>
     <canvas width="512" height="512"></canvas>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let canvas, gl;
       let program;
       let squareVerticesPositionBuffer;
       let squareVerticesColorBuffer;
       let vertexPositionAttribute;
       let vertexColorAttribute;
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_array.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_array.html
@@ -9,18 +9,18 @@ Test ArrayRep rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - ArrayRep</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 /* import-globals-from head.js */
 
 window.onload = Task.async(function* () {
   const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, ArrayRep } = REPS;
 
   let componentUnderTest = ArrayRep;
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_attribute.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_attribute.html
@@ -9,18 +9,18 @@ Test Attribute rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Attribute</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, Attribute } = REPS;
 
     let gripStub = {
       "type": "object",
       "class": "Attr",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_comment-node.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_comment-node.html
@@ -9,18 +9,18 @@ Test comment-node rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - comment-node</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   try {
     const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, CommentNode } = REPS;
 
     let gripStub = {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_date-time.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_date-time.html
@@ -9,18 +9,18 @@ Test DateTime rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - DateTime</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, DateTime } = REPS;
 
   try {
     testValid();
     testInvalid();
   } catch(e) {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_document.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_document.html
@@ -9,18 +9,18 @@ Test Document rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Document</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Document } = REPS;
 
   try {
     let gripStub = {
       "type": "object",
       "class": "HTMLDocument",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_element-node.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_element-node.html
@@ -9,18 +9,18 @@ Test Element node rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Element node</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_error.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_error.html
@@ -9,18 +9,18 @@ Test Error rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Error</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, ErrorRep } = REPS;
 
   try {
     // Test errors with different properties
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_event.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_event.html
@@ -9,18 +9,18 @@ Test Event rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Event</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Event } = REPS;
 
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_failure.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_failure.html
@@ -9,18 +9,18 @@ Test fallback for rep rendering when a r
 <head>
   <meta charset="utf-8">
   <title>Rep test - Failure</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, ArrayRep, RegExp } = REPS;
 
     // Force the RegExp rep to crash by creating RegExp grip that throws when accessing
     // the displayString property
     let gripStub = {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_function.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_function.html
@@ -9,18 +9,18 @@ Test Func rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Func</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Func } = REPS;
 
   const componentUnderTest = Func;
 
   try {
     // Test that correct rep is chosen
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-array.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-array.html
@@ -9,18 +9,18 @@ Test GripArray rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - GripArray</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, GripArray } = REPS;
 
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-map.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-map.html
@@ -9,18 +9,18 @@ Test GripMap rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - GripMap</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip.html
@@ -9,18 +9,18 @@ Test grip rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - grip</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Grip } = REPS;
 
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_infinity.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_infinity.html
@@ -9,18 +9,18 @@ Test Infinity rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Infinity</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, InfinityRep } = REPS;
 
   try {
     yield testInfinity();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_long-string.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_long-string.html
@@ -9,18 +9,18 @@ Test LongString rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - LongString</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, LongStringRep } = REPS;
 
   try {
     // Test that correct rep is chosen
     const renderedRep = shallowRenderComponent(Rep, { object: getGripStub("testMultiline") });
     is(renderedRep.type, LongStringRep.rep,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_nan.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_nan.html
@@ -9,18 +9,18 @@ Test NaN rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - NaN</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, NaNRep } = REPS;
 
   try {
     yield testNaN();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_null.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_null.html
@@ -9,18 +9,18 @@ Test Null rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Null</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, Null } = REPS;
 
     let gripStub = {
       "type": "null"
     };
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_number.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_number.html
@@ -9,18 +9,18 @@ Test Number rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Number</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Number } = REPS;
 
   try {
     yield testInt();
     yield testBoolean();
     yield testNegativeZero();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-text.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-text.html
@@ -9,18 +9,18 @@ Test ObjectWithText rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - ObjectWithText</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, ObjectWithText } = REPS;
 
     let gripStub = {
       "type": "object",
       "class": "CSSStyleRule",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-url.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-url.html
@@ -9,18 +9,18 @@ Test ObjectWithURL rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - ObjectWithURL</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
 
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, ObjectWithURL } = REPS;
 
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object.html
@@ -9,18 +9,18 @@ Test Obj rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Obj</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, Obj } = REPS;
 
   const componentUnderTest = Obj;
 
   try {
     yield testBasic();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_promise.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_promise.html
@@ -9,18 +9,18 @@ Test Promise rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Promise</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_regexp.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_regexp.html
@@ -9,18 +9,18 @@ Test RegExp rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - RegExp</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, RegExp } = REPS;
 
     let gripStub = {
       "type": "object",
       "class": "RegExp",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_string.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_string.html
@@ -9,18 +9,18 @@ Test String rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - String</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, StringRep } = REPS;
 
   const test_cases = [{
     name: "testMultiline",
     props: {
       object: "aaaaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbb\ncccccccccccccccc\n",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_stylesheet.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_stylesheet.html
@@ -9,18 +9,18 @@ Test Stylesheet rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - Stylesheet</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, StyleSheet } = REPS;
 
     let gripStub = {
       "type": "object",
       "class": "CSSStyleSheet",
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_symbol.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_symbol.html
@@ -9,18 +9,18 @@ Test Symbol rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - String</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 /* import-globals-from head.js */
 
 window.onload = Task.async(function* () {
   const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
   let { Rep, SymbolRep } = REPS;
 
   let gripStubs = new Map();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_text-node.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_text-node.html
@@ -9,18 +9,18 @@ Test text-node rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - text-node</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = Task.async(function* () {
   const {
     REPS,
     MODE,
     getSelectableInInspectorGrips,
   } = browserRequire("devtools/client/shared/components/reps/reps");
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_undefined.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_undefined.html
@@ -9,18 +9,18 @@ Test undefined rep
 <head>
   <meta charset="utf-8">
   <title>Rep test - undefined</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     const { REPS } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, Undefined } = REPS;
 
     let gripStub = {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_window.html
+++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_window.html
@@ -9,18 +9,18 @@ Test window rep
 <head>
   <meta charset="utf-8">
   <title>Rep tests - window</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
 
     const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/reps");
     let { Rep, Window } = REPS;
 
--- a/devtools/client/shared/components/test/mochitest/test_HSplitBox_01.html
+++ b/devtools/client/shared/components/test/mochitest/test_HSplitBox_01.html
@@ -17,18 +17,18 @@ Basic tests for the HSplitBox component.
   <style>
     html {
       --theme-splitter-color: black;
     }
   </style>
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 const FUDGE_FACTOR = .1;
 function aboutEq(a, b) {
   dumpn(`Checking ${a} ~= ${b}`);
   return Math.abs(a - b) < FUDGE_FACTOR;
 }
 
 window.onload = Task.async(function* () {
   try {
--- a/devtools/client/shared/components/test/mochitest/test_frame_01.html
+++ b/devtools/client/shared/components/test/mochitest/test_frame_01.html
@@ -10,18 +10,18 @@ with optional columns, unknown and non-U
 <head>
   <meta charset="utf-8">
   <title>Frame component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let Frame = React.createFactory(browserRequire("devtools/client/shared/components/frame"));
     ok(Frame, "Should get Frame");
 
     // Check when there's a column
--- a/devtools/client/shared/components/test/mochitest/test_notification_box_01.html
+++ b/devtools/client/shared/components/test/mochitest/test_notification_box_01.html
@@ -13,18 +13,18 @@ Test for Notification Box. The test is c
 <head>
   <meta charset="utf-8">
   <title>Notification Box</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let { NotificationBox, PriorityLevels } = browserRequire("devtools/client/shared/components/notification-box");
 
     const renderedBox = shallowRenderComponent(NotificationBox, {});
     is(renderedBox.type, "div", "NotificationBox is rendered as <div>");
--- a/devtools/client/shared/components/test/mochitest/test_notification_box_02.html
+++ b/devtools/client/shared/components/test/mochitest/test_notification_box_02.html
@@ -10,18 +10,18 @@ Test for Notification Box. The test is c
 <head>
   <meta charset="utf-8">
   <title>Notification Box</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let { NotificationBox, PriorityLevels } = browserRequire("devtools/client/shared/components/notification-box");
 
     // Test rendering
     let boxElement = React.createElement(NotificationBox);
--- a/devtools/client/shared/components/test/mochitest/test_notification_box_03.html
+++ b/devtools/client/shared/components/test/mochitest/test_notification_box_03.html
@@ -10,18 +10,18 @@ Test for Notification Box. The test is c
 <head>
   <meta charset="utf-8">
   <title>Notification Box</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let { NotificationBox, PriorityLevels } = browserRequire("devtools/client/shared/components/notification-box");
 
     // Test rendering
     let boxElement = React.createElement(NotificationBox);
--- a/devtools/client/shared/components/test/mochitest/test_sidebar_toggle.html
+++ b/devtools/client/shared/components/test/mochitest/test_sidebar_toggle.html
@@ -9,18 +9,18 @@ Test sidebar toggle button
 <head>
   <meta charset="utf-8">
   <title>Sidebar toggle button test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   let SidebarToggle = browserRequire("devtools/client/shared/components/sidebar-toggle.js");
 
   try {
     yield test();
   } catch(e) {
     ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e));
   } finally {
--- a/devtools/client/shared/components/test/mochitest/test_tabs_accessibility.html
+++ b/devtools/client/shared/components/test/mochitest/test_tabs_accessibility.html
@@ -9,18 +9,18 @@ Test tabs accessibility.
 <head>
   <meta charset="utf-8">
   <title>Tabs component accessibility test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const InspectorTabPanel = React.createFactory(browserRequire("devtools/client/inspector/components/inspector-tab-panel"));
     const Tabbar = React.createFactory(browserRequire("devtools/client/shared/components/tabs/tabbar"));
     const tabbar = Tabbar();
--- a/devtools/client/shared/components/test/mochitest/test_tabs_menu.html
+++ b/devtools/client/shared/components/test/mochitest/test_tabs_menu.html
@@ -16,18 +16,18 @@ Test all-tabs menu.
   <link rel="stylesheet" type="text/css" href="resource://devtools/client/themes/light-theme.css">
   <link rel="stylesheet" type="text/css" href="resource://devtools/client/shared/components/tabs/tabs.css">
   <link rel="stylesheet" type="text/css" href="resource://devtools/client/shared/components/tabs/tabbar.css">
   <link rel="stylesheet" type="text/css" href="resource://devtools/client/inspector/components/side-panel.css">
   <link rel="stylesheet" type="text/css" href="resource://devtools/client/inspector/components/inspector-tab-panel.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const Tabbar = React.createFactory(browserRequire("devtools/client/shared/components/tabs/tabbar"));
 
     // Create container for the TabBar. Set smaller width
     // to ensure that tabs won't fit and the all-tabs menu
--- a/devtools/client/shared/components/test/mochitest/test_tree_01.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_01.html
@@ -10,18 +10,18 @@ depth.
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     ok(React, "Should get React");
     ok(Tree, "Should get Tree");
--- a/devtools/client/shared/components/test/mochitest/test_tree_02.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_02.html
@@ -9,18 +9,18 @@ Test that collapsed subtrees aren't rend
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     const tree = ReactDOM.render(Tree(TEST_TREE_INTERFACE), window.document.body);
 
--- a/devtools/client/shared/components/test/mochitest/test_tree_03.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_03.html
@@ -9,18 +9,18 @@ Test Tree's autoExpandDepth.
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     let React = browserRequire("devtools/client/shared/vendor/react");
     let Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     const tree = ReactDOM.render(Tree(Object.assign({}, TEST_TREE_INTERFACE, {
       autoExpandDepth: 1
--- a/devtools/client/shared/components/test/mochitest/test_tree_04.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_04.html
@@ -9,18 +9,18 @@ Test that we only render visible tree it
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     function getSpacerHeights() {
       return {
         top: document.querySelector(".tree > div:first-of-type").clientHeight,
         bottom: document.querySelector(".tree > div:last-of-type").clientHeight,
       };
     }
--- a/devtools/client/shared/components/test/mochitest/test_tree_05.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_05.html
@@ -9,18 +9,18 @@ Test focusing with the Tree component.
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
--- a/devtools/client/shared/components/test/mochitest/test_tree_06.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_06.html
@@ -9,18 +9,18 @@ Test keyboard navigation with the Tree c
 <head>
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     function renderTree(props) {
--- a/devtools/client/shared/components/test/mochitest/test_tree_07.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_07.html
@@ -10,18 +10,18 @@ Test that arrows get the open attribute 
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <link rel="stylesheet" href="chrome://devtools/skin/light-theme.css" type="text/css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     const treeProps = Object.assign({}, TEST_TREE_INTERFACE, {
       renderItem: (item, depth, focused, arrow) => {
--- a/devtools/client/shared/components/test/mochitest/test_tree_08.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_08.html
@@ -11,18 +11,18 @@ other inputs.
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <link rel="stylesheet" href="chrome://devtools/skin/light-theme.css" type="text/css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     function renderTree(props) {
--- a/devtools/client/shared/components/test/mochitest/test_tree_09.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_09.html
@@ -10,18 +10,18 @@ Test that when an item in the Tree compo
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <link rel="stylesheet" href="chrome://devtools/skin/light-theme.css" type="text/css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     let numberOfExpands = 0;
--- a/devtools/client/shared/components/test/mochitest/test_tree_10.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_10.html
@@ -10,18 +10,18 @@ Test that when an item in the Tree compo
   <meta charset="utf-8">
   <title>Tree component test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <link rel="stylesheet" href="chrome://devtools/skin/light-theme.css" type="text/css">
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     function renderTree(props) {
--- a/devtools/client/shared/components/test/mochitest/test_tree_11.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_11.html
@@ -21,18 +21,18 @@ Test that when an item in the Tree compo
        min-height: 30px;
        font-size: 10px;
        overflow: auto;
    }
   </style>
 </head>
 <body>
 <pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
+<script src="head.js" type="application/javascript"></script>
+<script type="application/javascript">
 window.onload = Task.async(function* () {
   try {
     const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
     const React = browserRequire("devtools/client/shared/vendor/react");
     const { Simulate } = React.addons.TestUtils;
     const Tree = React.createFactory(browserRequire("devtools/client/shared/components/tree"));
 
     TEST_TREE.expanded = new Set("ABCDEFGHIJKLMNO".split(""));
--- a/devtools/client/shared/shim/test/test_service_appinfo.html
+++ b/devtools/client/shared/shim/test/test_service_appinfo.html
@@ -5,25 +5,25 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 1265802 - replace Services.appinfo</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   "use strict";
   var exports = {}
   var module = {exports};
   </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/client/shared/shim/Services.js"></script>
 </head>
 <body>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 
 is(Services.appinfo.OS, SpecialPowers.Services.appinfo.OS,
    "check that Services.appinfo.OS shim matches platform");
 </script>
 </body>
--- a/devtools/client/shared/shim/test/test_service_focus.html
+++ b/devtools/client/shared/shim/test/test_service_focus.html
@@ -5,23 +5,23 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 1278473 - replace Services.focus</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   "use strict";
   var exports = {}
   var module = {exports};
   </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/client/shared/shim/Services.js"></script>
 </head>
 <body>
   <span>
     <span id="start" testvalue="0" tabindex="0"> </span>
     <label>
       <input testvalue="1" type="radio">Hi</input>
     </label>
@@ -30,17 +30,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     </label>
     <label style="display: none">
       <input id="button3" type="radio" tabindex="-1">Invisible</input>
     </label>
     <input id="button4" type="radio" disabled="true">Disabled</input>
     <span testvalue="2" tabindex="0"> </span>
   </span>
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
   "use strict";
 
   // The test assumes these are identical, so assert it here.
   is(Services.focus.MOVEFOCUS_BACKWARD, SpecialPowers.Services.focus.MOVEFOCUS_BACKWARD,
      "check MOVEFOCUS_BACKWARD");
   is(Services.focus.MOVEFOCUS_FORWARD, SpecialPowers.Services.focus.MOVEFOCUS_FORWARD,
      "check MOVEFOCUS_FORWARD");
 
--- a/devtools/client/shared/shim/test/test_service_prefs.html
+++ b/devtools/client/shared/shim/test/test_service_prefs.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 1265808 - replace Services.prefs</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 var exports = {}
 var module = {exports};
 
  // Add some starter prefs.
 localStorage.setItem("Services.prefs:devtools.branch1.somebool", JSON.stringify({
   // bool
   type: 128,
@@ -37,23 +37,23 @@ localStorage.setItem("Services.prefs:dev
   type: 64,
   defaultValue: -16,
   hasUserValue: false,
   userValue: null
 }));
 
 </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="prefs-wrapper.js"></script>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/client/shared/shim/Services.js"></script>
 </head>
 <body>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 
 function do_tests() {
   // We can't load the defaults in this context.
   Services._defaultPrefsEnabled = false;
 
   is(Services.prefs.getBoolPref("devtools.branch1.somebool"), false,
     "bool pref value");
--- a/devtools/client/shared/shim/test/test_service_prefs_defaults.html
+++ b/devtools/client/shared/shim/test/test_service_prefs_defaults.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 1309384 - Services.prefs replacement defaults handling</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 var exports = {}
 var module = {exports};
 
 // Allow one require("raw!prefs...") to return some defaults, with the
 // others being ignored.
 var firstTime = true;
 function require(something) {
@@ -38,21 +38,21 @@ localStorage.setItem("Services.prefs:pre
   type: 32,
   defaultValue: "pref3default",
   hasUserValue: true,
   userValue: "glass winged butterfly"
 }));
 
 </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/client/shared/shim/Services.js"></script>
 </head>
 <body>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 
 is(Services.prefs.getCharPref("pref1"), "pref1default", "pref1 value");
 is(Services.prefs.getCharPref("pref2"), "pref2default", "pref2 value");
 is(Services.prefs.getCharPref("pref2.sub1"), "pref2sub1default", "pref2 sub1 value");
 is(Services.prefs.getCharPref("pref3"), "glass winged butterfly", "pref3 value");
 
 // Only pref3 should be in local storage at this point.
--- a/devtools/client/shared/shim/test/test_service_wm.html
+++ b/devtools/client/shared/shim/test/test_service_wm.html
@@ -5,28 +5,28 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <title>Test for Bug 1310279 - replace Services.wm</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   "use strict";
   var exports = {}
   var module = {exports};
   </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/client/shared/shim/Services.js"></script>
 </head>
 <body>
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
   "use strict";
 
   function hurray(window) {
     ok(true, "window loaded");
     SimpleTest.finish();
   }
 
   SimpleTest.waitForExplicitFinish();
--- a/devtools/client/shared/test/browser_toolbar_webconsole_errors_count.html
+++ b/devtools/client/shared/test/browser_toolbar_webconsole_errors_count.html
@@ -16,17 +16,17 @@
   <script type="text/javascript">
     window.foobarBug762996b();
   </script>
 </head>
 <body>
   <p>Hello world! Test for errors count in the Web Console button (developer
   toolbar).</p>
   <p style="color: foobarBug762996css"><button>click me</button></p>
-  <script type="text/javascript;version=1.8">
+  <script type="text/javascript">
     "use strict";
     let testObj = {};
     document.querySelector("button").onclick = function() {
       let test = testObj.fooBug788445 + "warning";
       window.foobarBug762996click();
     };
   </script>
 </body>
--- a/devtools/client/shared/widgets/VariablesView.xul
+++ b/devtools/client/shared/widgets/VariablesView.xul
@@ -7,12 +7,12 @@
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % viewDTD SYSTEM "chrome://devtools/locale/VariablesView.dtd">
   %viewDTD;
 ]>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&PropertiesViewWindowTitle;">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <vbox id="variables" flex="1"/>
 </window>
--- a/devtools/client/shared/widgets/graphs-frame.xhtml
+++ b/devtools/client/shared/widgets/graphs-frame.xhtml
@@ -3,17 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" ype="text/css"/>
-  <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
     body {
       overflow: hidden;
       margin: 0;
       padding: 0;
       font-size: 0;
     }
   </style>
--- a/devtools/client/storage/storage.xul
+++ b/devtools/client/storage/storage.xul
@@ -11,17 +11,17 @@
   <!ENTITY % storageDTD SYSTEM "chrome://devtools/locale/storage.dtd">
   %storageDTD;
 ]>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <commandset id="editMenuCommands"/>
 
   <popupset id="storagePopupSet">
     <menupopup id="storage-tree-popup">
       <menuitem id="storage-tree-popup-delete-all"
--- a/devtools/client/storage/test/storage-cache-error.html
+++ b/devtools/client/storage/test/storage-cache-error.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for handling errors in CacheStorage</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 
 // Create an iframe with a javascript: source URL. Such iframes are
 // considered untrusted by the CacheStorage.
 let frameEl = document.createElement("iframe");
 document.body.appendChild(frameEl);
 
 window.frameContent = 'Hello World';
--- a/devtools/client/storage/test/storage-complex-values.html
+++ b/devtools/client/storage/test/storage-complex-values.html
@@ -3,17 +3,17 @@
 <!--
 Bug 970517 - Storage inspector front end - tests
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for correct values in the sidebar</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime = 2000000000000;
 // Setting up some cookies to eat.
 document.cookie = "c1=" + JSON.stringify([
   "foo", "Bar", {
     foo: "Bar"
   }]) + "; expires=" + new Date(cookieExpiresTime).toGMTString() +
--- a/devtools/client/storage/test/storage-cookies.html
+++ b/devtools/client/storage/test/storage-cookies.html
@@ -3,17 +3,17 @@
   <!--
   Bug 970517 - Storage inspector front end - tests
   -->
   <head>
     <meta charset="utf-8">
     <title>Storage inspector cookie test</title>
   </head>
   <body>
-    <script type="application/javascript;version=1.7">
+    <script type="application/javascript">
     "use strict";
     let expiresIn24Hours = new Date(Date.now() + 60 * 60 * 24 * 1000).toUTCString();
     for (let i = 1; i <= 5; i++) {
       let cookieString = "test" + i + "=value" + i +
         ";expires=" + expiresIn24Hours + ";path=/browser";
       if (i % 2) {
         cookieString += ";domain=test1.example.org";
       }
--- a/devtools/client/storage/test/storage-empty-objectstores.html
+++ b/devtools/client/storage/test/storage-empty-objectstores.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
   <title>Test for proper listing indexedDB databases with no object stores</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 window.setup = function* () {
   let request = indexedDB.open("idb1", 1);
   let db = yield new Promise((resolve, reject) => {
     request.onerror = e => reject(Error("error opening db connection"));
     request.onupgradeneeded = event => {
       let db = event.target.result;
       let store1 = db.createObjectStore("obj1", { keyPath: "id" });
--- a/devtools/client/storage/test/storage-idb-delete-blocked.html
+++ b/devtools/client/storage/test/storage-idb-delete-blocked.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
   <title>Test for proper listing indexedDB databases with no object stores</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 let db;
 
 window.setup = function* () {
   db = yield new Promise((resolve, reject) => {
     let request = indexedDB.open("idb", 1);
 
     request.onsuccess = e => resolve(e.target.result);
--- a/devtools/client/storage/test/storage-indexeddb-duplicate-names.html
+++ b/devtools/client/storage/test/storage-indexeddb-duplicate-names.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
   <title>Storage inspector IndexedDBs with duplicate names</title>
 
-  <script type="application/javascript;version=1.7">
+  <script type="application/javascript">
     "use strict";
 
     function createIndexedDBs() {
       createIndexedDB("idb1", "temporary");
       createIndexedDB("idb1", "default");
       createIndexedDB("idb1", "persistent");
       createIndexedDB("idb2", "temporary");
       createIndexedDB("idb2", "default");
--- a/devtools/client/storage/test/storage-listings-usercontextid.html
+++ b/devtools/client/storage/test/storage-listings-usercontextid.html
@@ -5,17 +5,17 @@ Storage inspector front end for userCont
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
 <iframe src="http://sectest1.example.org/browser/devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html"></iframe>
 <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe-usercontextid.html"></iframe>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime1 = 2000000000000;
 let cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1uc1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
 document.cookie = "cs2uc1=sessionCookie; path=/; domain=" + partialHostname;
--- a/devtools/client/storage/test/storage-listings-with-fragment.html
+++ b/devtools/client/storage/test/storage-listings-with-fragment.html
@@ -8,17 +8,17 @@ include fragments e.g. http://example.co
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages with URL fragments</title>
 </head>
 <body>
 <iframe src="http://sectest1.example.org/browser/devtools/client/storage/test/storage-unsecured-iframe.html#def"></iframe>
 <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html#ghi"></iframe>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime1 = 2000000000000;
 let cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
 document.cookie = "cs2=sessionCookie; path=/; domain=" + partialHostname;
--- a/devtools/client/storage/test/storage-listings.html
+++ b/devtools/client/storage/test/storage-listings.html
@@ -5,17 +5,17 @@ Storage inspector front end - tests
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
 <iframe src="http://sectest1.example.org/browser/devtools/client/storage/test/storage-unsecured-iframe.html"></iframe>
 <iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html"></iframe>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime1 = 2000000000000;
 let cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
 document.cookie = "cs2=sessionCookie; path=/; domain=" + partialHostname;
--- a/devtools/client/storage/test/storage-localstorage.html
+++ b/devtools/client/storage/test/storage-localstorage.html
@@ -1,17 +1,17 @@
 <!doctype html>
 <html>
   <!--
   Bug 1231155 - Storage inspector front end - tests
   -->
   <head>
     <meta charset="utf-8" />
     <title>Storage inspector localStorage test</title>
-    <script type="application/javascript;version=1.7">
+    <script type="application/javascript">
       "use strict";
 
       function setup() {
         localStorage.setItem("TestLS1", "ValueLS1");
         localStorage.setItem("TestLS2", "ValueLS2");
         localStorage.setItem("TestLS3", "ValueLS3");
         localStorage.setItem("TestLS4", "ValueLS4");
         localStorage.setItem("TestLS5", "ValueLS5");
--- a/devtools/client/storage/test/storage-overflow.html
+++ b/devtools/client/storage/test/storage-overflow.html
@@ -3,17 +3,17 @@
 <!--
 Bug 1171903 - Storage Inspector endless scrolling
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector endless scrolling test</title>
 </head>
 <body>
-<script type="text/javascript;version=1.8">
+<script type="text/javascript">
 "use strict";
 
 for (let i = 0; i < 160; i++) {
   localStorage.setItem(`item-${i}`, `value-${i}`);
 }
 </script>
 </body>
 </html>
--- a/devtools/client/storage/test/storage-search.html
+++ b/devtools/client/storage/test/storage-search.html
@@ -3,17 +3,17 @@
 <!--
 Bug 1224115 - Storage Inspector table filtering
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector table filtering test</title>
 </head>
 <body>
-<script type="text/javascript;version=1.8">
+<script type="text/javascript">
 "use strict";
 
 localStorage.setItem("01234", "56789");
 localStorage.setItem("ANIMAL", "hOrSe");
 localStorage.setItem("FOO", "bArBaz");
 localStorage.setItem("food", "energy bar");
 localStorage.setItem("money", "##$$$**");
 localStorage.setItem("sport", "football");
--- a/devtools/client/storage/test/storage-secured-iframe-usercontextid.html
+++ b/devtools/client/storage/test/storage-secured-iframe-usercontextid.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 Iframe for testing multiple host detetion in storage actor
 -->
 <head>
   <meta charset="utf-8">
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 document.cookie = "sc1uc1=foobar;";
 localStorage.setItem("iframe-s-ls1uc1", "foobar");
 sessionStorage.setItem("iframe-s-ss1uc1", "foobar-2");
 dump("added cookies and storage from secured iframe\n");
 
 let idbGenerator = function*() {
   let request = indexedDB.open("idb-s1uc1", 1);
--- a/devtools/client/storage/test/storage-secured-iframe.html
+++ b/devtools/client/storage/test/storage-secured-iframe.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 Iframe for testing multiple host detetion in storage actor
 -->
 <head>
   <meta charset="utf-8">
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 document.cookie = "sc1=foobar;";
 localStorage.setItem("iframe-s-ls1", "foobar");
 sessionStorage.setItem("iframe-s-ss1", "foobar-2");
 dump("added cookies and storage from secured iframe\n");
 
 let idbGenerator = function*() {
   let request = indexedDB.open("idb-s1", 1);
--- a/devtools/client/storage/test/storage-sessionstorage.html
+++ b/devtools/client/storage/test/storage-sessionstorage.html
@@ -1,17 +1,17 @@
 <!doctype html>
 <html>
   <!--
   Bug 1231179 - Storage inspector front end - tests
   -->
   <head>
     <meta charset="utf-8" />
     <title>Storage inspector sessionStorage test</title>
-    <script type="application/javascript;version=1.7">
+    <script type="application/javascript">
       "use strict";
 
       function setup() {
         sessionStorage.setItem("TestSS1", "ValueSS1");
         sessionStorage.setItem("TestSS2", "ValueSS2");
         sessionStorage.setItem("TestSS3", "ValueSS3");
         sessionStorage.setItem("TestSS4", "ValueSS4");
         sessionStorage.setItem("TestSS5", "ValueSS5");
--- a/devtools/client/storage/test/storage-updates.html
+++ b/devtools/client/storage/test/storage-updates.html
@@ -3,17 +3,17 @@
 <!--
 Bug 965872 - Storage inspector actor with cookies, local storage and session storage.
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector blank html for tests</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 window.addCookie = function(name, value, path, domain, expires, secure) {
   let cookieString = name + "=" + value + ";";
   if (path) {
     cookieString += "path=" + path + ";";
   }
   if (domain) {
     cookieString += "domain=" + domain + ";";
--- a/devtools/client/styleeditor/styleeditor.xul
+++ b/devtools/client/styleeditor/styleeditor.xul
@@ -20,17 +20,17 @@
 <?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/styleeditor.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <xul:window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns="http://www.w3.org/1999/xhtml"
         id="style-editor-chrome-window">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <xul:script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
   <xul:script type="application/javascript">
     function goUpdateSourceEditorMenuItems() {
       goUpdateGlobalEditMenuItems();
 
       ['cmd_undo', 'cmd_redo', 'cmd_cut', 'cmd_paste',
--- a/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.html
+++ b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <head>
   <meta charset="utf-8">
   <title>Resources</title>
-  <script type="text/javascript;version=1.8" id="script1">
+  <script type="text/javascript" id="script1">
     "use strict";
 
     window.addEventListener("load", function onload() {
       let pid = document.getElementById("pid");
       let div = document.createElement("div");
       div.id = "divid";
       div.classList.add("divclass");
       div.appendChild(document.createTextNode("div"));
--- a/devtools/client/styleeditor/test/longload.html
+++ b/devtools/client/styleeditor/test/longload.html
@@ -14,16 +14,16 @@
 
   div > span {
      text-decoration: underline;
   }
   </style>
 </head>
 <body>
   Time passes:
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
     "use strict";
     for (let i = 0; i < 5000; i++) {
       document.write("<br>...");
     }
   </script>
 </body>
 </html>
--- a/devtools/client/webaudioeditor/test/doc_automation.html
+++ b/devtools/client/webaudioeditor/test/doc_automation.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
       let gain = ctx.createGain();
       gain.gain.value = 0;
       osc.frequency.setValueAtTime(0.2, 0);
       osc.frequency.linearRampToValueAtTime(1, 0.3);
--- a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
+++ b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let audioURL = "http://example.com/browser/devtools/client/webaudioeditor/test/440hz_sine.ogg";
 
       let ctx = new AudioContext();
       let bufferNode = ctx.createBufferSource();
       let shaperNode = ctx.createWaveShaper();
       shaperNode.curve = generateWaveShapingCurve();
--- a/devtools/client/webaudioeditor/test/doc_bug_1112378.html
+++ b/devtools/client/webaudioeditor/test/doc_bug_1112378.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
 
       function throwError () {
         try {
           osc.connect({});
--- a/devtools/client/webaudioeditor/test/doc_bug_1125817.html
+++ b/devtools/client/webaudioeditor/test/doc_bug_1125817.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
       osc.frequency.value = 200;
       osc.disconnect();
     </script>
   </body>
--- a/devtools/client/webaudioeditor/test/doc_bug_1130901.html
+++ b/devtools/client/webaudioeditor/test/doc_bug_1130901.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       ctx.createOscillator.call(ctx);
       ctx.createGain.apply(ctx, []);
     </script>
   </body>
 
--- a/devtools/client/webaudioeditor/test/doc_bug_1141261.html
+++ b/devtools/client/webaudioeditor/test/doc_bug_1141261.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
       let gain = ctx.createGain();
       osc.connect(gain);
       gain.connect(ctx.destination);
       gain.disconnect();
--- a/devtools/client/webaudioeditor/test/doc_complex-context.html
+++ b/devtools/client/webaudioeditor/test/doc_complex-context.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
 /*
          ↱   proc
   osc    →   gain   →
   osc    →   gain   →  destination
   buffer →↳  filter →
 */
--- a/devtools/client/webaudioeditor/test/doc_connect-multi-param.html
+++ b/devtools/client/webaudioeditor/test/doc_connect-multi-param.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let carrier = ctx.createOscillator();
       let gain = ctx.createGain();
       let modulator = ctx.createOscillator();
       let modulator2 = ctx.createOscillator();
       carrier.connect(gain);
--- a/devtools/client/webaudioeditor/test/doc_connect-param.html
+++ b/devtools/client/webaudioeditor/test/doc_connect-param.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let carrier = ctx.createOscillator();
       let modulator = ctx.createOscillator();
       let gain = ctx.createGain();
       carrier.connect(gain);
       gain.connect(ctx.destination);
--- a/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
+++ b/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
       // Keep the nodes we want to GC alive until we are ready for them to
       // be collected. We will zero this reference by force from the devtools
       // side.
       var keepAlive = [];
       (function () {
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
--- a/devtools/client/webaudioeditor/test/doc_media-node-creation.html
+++ b/devtools/client/webaudioeditor/test/doc_media-node-creation.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let audio = new Audio();
       let meNode, msNode, mdNode;
       navigator.getUserMedia = navigator.getUserMedia || navigator.mozGetUserMedia;
 
       navigator.getUserMedia({ audio: true, fake: true }, stream => {
--- a/devtools/client/webaudioeditor/test/doc_simple-context.html
+++ b/devtools/client/webaudioeditor/test/doc_simple-context.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let osc = ctx.createOscillator();
       let gain = ctx.createGain();
       gain.gain.value = 0;
 
       // Connect multiple times to test that it's disregarded.
--- a/devtools/client/webaudioeditor/test/doc_simple-node-creation.html
+++ b/devtools/client/webaudioeditor/test/doc_simple-node-creation.html
@@ -5,17 +5,17 @@
 <html>
   <head>
     <meta charset="utf-8"/>
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
-    <script type="text/javascript;version=1.8">
+    <script type="text/javascript">
       "use strict";
 
       let ctx = new AudioContext();
       let NODE_CREATION_METHODS = [
           "createBufferSource", "createScriptProcessor", "createAnalyser",
           "createGain", "createDelay", "createBiquadFilter", "createWaveShaper",
           "createPanner", "createConvolver", "createChannelSplitter", "createChannelMerger",
           "createDynamicsCompressor", "createOscillator", "createStereoPanner"
--- a/devtools/client/webaudioeditor/webaudioeditor.xul
+++ b/devtools/client/webaudioeditor/webaudioeditor.xul
@@ -8,17 +8,17 @@
 <?xml-stylesheet href="chrome://devtools/skin/webaudioeditor.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://devtools/locale/webaudioeditor.dtd">
   %debuggerDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
 
   <script type="application/javascript" src="chrome://devtools/content/shared/vendor/d3.js"/>
   <script type="application/javascript" src="chrome://devtools/content/shared/vendor/dagre-d3.js"/>
   <script type="application/javascript" src="includes.js"/>
   <script type="application/javascript" src="models.js"/>
   <script type="application/javascript" src="controller.js"/>
   <script type="application/javascript" src="views/utils.js"/>
--- a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
@@ -1,23 +1,23 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for getRepeatId()</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript;version=1.8" src="head.js"></script>
+  <script type="application/javascript" src="head.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for render perf</p>
 <div id="output"></div>
 
-<script type="text/javascript;version=1.8">
+<script type="text/javascript">
 "use strict";
 
 const testPackets = [];
 const numMessages = 1000;
 for (let id = 0; id < numMessages; id++) {
   let message = "Odd text";
   if (id % 2 === 0) {
     message = "Even text";
--- a/devtools/client/webconsole/test/test-bug-632275-getters.html
+++ b/devtools/client/webconsole/test/test-bug-632275-getters.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title>Web Console test for bug 632275 - getters</title>
     <!-- Any copyright is dedicated to the Public Domain.
          http://creativecommons.org/publicdomain/zero/1.0/ -->
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
   document.foobar = {
     _val: 5,
     get val() { return ++this._val; }
   };
 </script>
 
   </head>
   <body>
--- a/devtools/client/webconsole/webconsole.xul
+++ b/devtools/client/webconsole/webconsole.xul
@@ -19,19 +19,19 @@
         macanimationtype="document"
         fullscreenbutton="true"
         title="&window.title;"
         browserConsoleTitle="&browserConsole.title;"
         windowtype="devtools:webconsole"
         width="900" height="350"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
           src="resource://devtools/client/webconsole/new-console-output/main.js"/>
   <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="text/javascript" src="resource://devtools/client/webconsole/net/main.js"/>
   <script type="text/javascript"><![CDATA[
 function goUpdateConsoleCommands() {
   goUpdateCommand("consoleCmd_openURL");
   goUpdateCommand("consoleCmd_copyURL");
 }
--- a/devtools/client/webide/content/addons.xhtml
+++ b/devtools/client/webide/content/addons.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/addons.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/addons.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/addons.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="aboutaddons">&addons_aboutaddons;</a>
       <a id="close">&deck_close;</a>
     </div>
 
--- a/devtools/client/webide/content/details.xhtml
+++ b/devtools/client/webide/content/details.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/details.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/details.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/details.js"></script>
   </head>
   <body>
 
     <div id="toolbar">
       <button onclick="removeProject()">&details_removeProject_button;</button>
       <p id="validation_status">
         <span class="valid">&details_valid_header;</span>
         <span class="warning">&details_warning_header;</span>
--- a/devtools/client/webide/content/devicepreferences.xhtml
+++ b/devtools/client/webide/content/devicepreferences.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/config-view.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/devicepreferences.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/devicepreferences.js"></script>
   </head>
   <body>
     <header>
       <div id="controls">
         <a id="close">&deck_close;</a>
       </div>
       <h1>&devicepreference_title;</h1>
       <div id="search">
--- a/devtools/client/webide/content/logs.xhtml
+++ b/devtools/client/webide/content/logs.xhtml
@@ -10,18 +10,18 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="resource://devtools/client/themes/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/logs.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
-    <script type="application/javascript;version=1.8" src="logs.js"></script>
+    <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"></script>
+    <script type="application/javascript" src="logs.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h1>&logs_title;</h1>
--- a/devtools/client/webide/content/monitor.xhtml
+++ b/devtools/client/webide/content/monitor.xhtml
@@ -11,17 +11,17 @@
 
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/monitor.css" type="text/css"/>
     <script src="chrome://devtools/content/shared/vendor/d3.js"></script>
-    <script type="application/javascript;version=1.8" src="monitor.js"></script>
+    <script type="application/javascript" src="monitor.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a href="https://developer.mozilla.org/docs/Tools/WebIDE/Monitor" target="_blank">&monitor_help;</a>
       <a id="close">&deck_close;</a>
     </div>
 
--- a/devtools/client/webide/content/prefs.xhtml
+++ b/devtools/client/webide/content/prefs.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/prefs.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/prefs.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="restore">&prefs_restore;</a>
       <a id="manageComponents">&prefs_manage_components;</a>
       <a id="close">&deck_close;</a>
     </div>
--- a/devtools/client/webide/content/project-listing.xhtml
+++ b/devtools/client/webide/content/project-listing.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/panel-listing.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/project-listing.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/project-listing.js"></script>
   </head>
   <body>
     <div id="project-panel">
       <div id="project-panel-box">
         <button class="panel-item project-panel-item-newapp" id="new-app">&projectMenu_newApp_label;</button>
         <button class="panel-item project-panel-item-openpackaged" id="packaged-app">&projectMenu_importPackagedApp_label;</button>
         <button class="panel-item project-panel-item-openhosted" id="hosted-app">&projectMenu_importHostedApp_label;</button>
         <label class="panel-header">&projectPanel_myProjects;</label>
--- a/devtools/client/webide/content/runtime-listing.xhtml
+++ b/devtools/client/webide/content/runtime-listing.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/panel-listing.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/runtime-listing.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/runtime-listing.js"></script>
   </head>
   <body>
     <div id="runtime-panel">
       <div id="runtime-panel-box">
         <label class="panel-header">&runtimePanel_usb;
           <button class="runtime-panel-item-refreshdevices refresh-icon" id="refresh-devices" title="&runtimePanel_refreshDevices_label;"></button>
         </label>
         <button class="panel-item" id="runtime-panel-nousbdevice">&runtimePanel_nousbdevice;</button>
--- a/devtools/client/webide/content/runtimedetails.xhtml
+++ b/devtools/client/webide/content/runtimedetails.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/runtimedetails.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/runtimedetails.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/runtimedetails.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h1>&runtimedetails_title;</h1>
--- a/devtools/client/webide/content/simulator.xhtml
+++ b/devtools/client/webide/content/simulator.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/simulator.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/simulator.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/simulator.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="remove" class="hidden">&simulator_remove;</a>
       <a id="reset">&simulator_reset;</a>
       <a id="close">&deck_close;</a>
     </div>
--- a/devtools/client/webide/content/wifi-auth.xhtml
+++ b/devtools/client/webide/content/wifi-auth.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html id="devtools:wifi-auth" xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/wifi-auth.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="chrome://webide/content/wifi-auth.js"></script>
+    <script type="application/javascript" src="chrome://webide/content/wifi-auth.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h3 id="header">&wifi_auth_header;</h3>
--- a/devtools/client/webide/test/test_addons.html
+++ b/devtools/client/webide/test/test_addons.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         const {GetAvailableAddons} = require("devtools/client/webide/modules/addons");
         const {Devices} = Cu.import("resource://devtools/shared/apps/Devices.jsm");
         const {Simulators} = require("devtools/client/webide/modules/simulators");
 
         let adbAddonsInstalled = promise.defer();
--- a/devtools/client/webide/test/test_app_validator.html
+++ b/devtools/client/webide/test/test_app_validator.html
@@ -8,17 +8,17 @@
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
     const Cu = Components.utils;
     const Cc = Components.classes;
     const Ci = Components.interfaces;
     Cu.import("resource://testing-common/httpd.js");
     const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
 
     const {AppValidator} = require("devtools/client/webide/modules/app-validator");
     const Services = require("Services");
--- a/devtools/client/webide/test/test_autoconnect_runtime.html
+++ b/devtools/client/webide/test/test_autoconnect_runtime.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function*() {
           if (!DebuggerServer.initialized) {
             DebuggerServer.init();
             DebuggerServer.addBrowserActors();
           }
--- a/devtools/client/webide/test/test_autoselect_project.html
+++ b/devtools/client/webide/test/test_autoselect_project.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
           if (!DebuggerServer.initialized) {
             DebuggerServer.init();
             DebuggerServer.addBrowserActors();
           }
--- a/devtools/client/webide/test/test_basic.html
+++ b/devtools/client/webide/test/test_basic.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
             let win = yield openWebIDE();
 
             const {gDevToolsBrowser} = require("devtools/client/framework/devtools-browser");
             yield gDevToolsBrowser.isWebIDEInitialized.promise;
--- a/devtools/client/webide/test/test_build.html
+++ b/devtools/client/webide/test/test_build.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         let {TextDecoder, OS} = Cu.import("resource://gre/modules/osfile.jsm", {});
         let {ProjectBuilding} = require("devtools/client/webide/modules/build");
 
         Task.spawn(function* () {
             let win = yield openWebIDE();
--- a/devtools/client/webide/test/test_device_preferences.html
+++ b/devtools/client/webide/test/test_device_preferences.html
@@ -2,24 +2,24 @@
 
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
-    <script type="application/javascript;version=1.8" src="device_front_shared.js"></script>
+    <script type="application/javascript" src="head.js"></script>
+    <script type="application/javascript" src="device_front_shared.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
           if (!DebuggerServer.initialized) {
             DebuggerServer.init();
             DebuggerServer.addBrowserActors();
           }
--- a/devtools/client/webide/test/test_device_runtime.html
+++ b/devtools/client/webide/test/test_device_runtime.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
           if (!DebuggerServer.initialized) {
             DebuggerServer.init();
             DebuggerServer.addBrowserActors();
           }
--- a/devtools/client/webide/test/test_duplicate_import.html
+++ b/devtools/client/webide/test/test_duplicate_import.html
@@ -3,22 +3,22 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function*() {
           let win = yield openWebIDE();
           let docProject = getProjectDocument(win);
           let winProject = getProjectWindow(win);
           let packagedAppLocation = getTestFilePath("app");
--- a/devtools/client/webide/test/test_fullscreenToolbox.html
+++ b/devtools/client/webide/test/test_fullscreenToolbox.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       function connectToLocal(win, docRuntime) {
         let deferred = promise.defer();
         win.AppManager.connection.once(
             win.Connection.Events.CONNECTED,
             () => deferred.resolve());
         docRuntime.querySelectorAll(".runtime-panel-item-other")[1].click();
         return deferred.promise;
       }
--- a/devtools/client/webide/test/test_import.html
+++ b/devtools/client/webide/test/test_import.html
@@ -3,22 +3,22 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function*() {
           let win = yield openWebIDE();
           let docProject = getProjectDocument(win);
           let winProject = getProjectWindow(win);
           let packagedAppLocation = getTestFilePath("app");
--- a/devtools/client/webide/test/test_manifestUpdate.html
+++ b/devtools/client/webide/test/test_manifestUpdate.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         let {TextDecoder, OS}  = Cu.import("resource://gre/modules/osfile.jsm", {});
 
         Task.spawn(function* () {
             let win = yield openWebIDE();
             let winProject = getProjectWindow(win);
--- a/devtools/client/webide/test/test_newapp.html
+++ b/devtools/client/webide/test/test_newapp.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
           let win = yield openWebIDE();
           let winProject = getProjectWindow(win);
           let tmpDir = FileUtils.getDir("TmpD", []);
           yield winProject.projectList.newApp({
--- a/devtools/client/webide/test/test_runtime.html
+++ b/devtools/client/webide/test/test_runtime.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         let win;
 
         SimpleTest.registerCleanupFunction(() => {
           Task.spawn(function*() {
             if (win) {
--- a/devtools/client/webide/test/test_simulators.html
+++ b/devtools/client/webide/test/test_simulators.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         const asyncStorage = require("devtools/shared/async-storage");
         const EventEmitter = require("devtools/shared/event-emitter");
         const { GetAvailableAddons } = require("devtools/client/webide/modules/addons");
         const { getDevices } = require("devtools/client/shared/devices");
         const { Simulator, Simulators } = require("devtools/client/webide/modules/simulators");
--- a/devtools/client/webide/test/test_telemetry.html
+++ b/devtools/client/webide/test/test_telemetry.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       const Telemetry = require("devtools/client/shared/telemetry");
       const { _DeprecatedUSBRuntime, _WiFiRuntime, _SimulatorRuntime,
               _gRemoteRuntime, _gLocalRuntime, RuntimeTypes }
             = require("devtools/client/webide/modules/runtimes");
 
       // Because we need to gather stats for the period of time that a tool has
       // been opened we make use of setTimeout() to create tool active times.
       const TOOL_DELAY = 200;
--- a/devtools/client/webide/test/test_toolbox.html
+++ b/devtools/client/webide/test/test_toolbox.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         let win;
 
         SimpleTest.registerCleanupFunction(() => {
           Task.spawn(function*() {
             if (win) {
--- a/devtools/client/webide/test/test_zoom.html
+++ b/devtools/client/webide/test/test_zoom.html
@@ -3,23 +3,23 @@
 <html>
 
   <head>
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <script type="application/javascript" src="chrome://mochikit/content/chrome-harness.js"></script>
-    <script type="application/javascript;version=1.8" src="head.js"></script>
+    <script type="application/javascript" src="head.js"></script>
     <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       window.onload = function() {
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
             let win = yield openWebIDE();
             let viewer = win.QueryInterface(Ci.nsIInterfaceRequestor)
                             .getInterface(Ci.nsIWebNavigation)
                             .QueryInterface(Ci.nsIDocShell)
--- a/devtools/server/tests/browser/storage-cookies-same-name.html
+++ b/devtools/server/tests/browser/storage-cookies-same-name.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <meta charset="utf-8">
   <title>Storage inspector cookies with duplicate names</title>
 </head>
 <body onload="createCookies()">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 function createCookies() {
   document.cookie = "name=value1;path=/;";
   document.cookie = "name=value2;path=/path2/;";
   document.cookie = "name=value3;path=/path3/;";
 }
 
 window.removeCookie = function (name) {
--- a/devtools/server/tests/browser/storage-dynamic-windows.html
+++ b/devtools/server/tests/browser/storage-dynamic-windows.html
@@ -4,17 +4,17 @@
 Bug 965872 - Storage inspector actor with cookies, local storage and session storage.
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
 <iframe src="http://sectest1.example.org/browser/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 const cookieExpiresTime1 = 2000000000000;
 const cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
 document.cookie = "cs2=sessionCookie; path=/; domain=" + partialHostname;
--- a/devtools/server/tests/browser/storage-listings.html
+++ b/devtools/server/tests/browser/storage-listings.html
@@ -5,17 +5,17 @@ Bug 965872 - Storage inspector actor wit
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
 <iframe src="http://sectest1.example.org/browser/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
 <iframe src="https://sectest1.example.org:443/browser/devtools/server/tests/browser/storage-secured-iframe.html"></iframe>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 const cookieExpiresTime1 = 2000000000000;
 const cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
 document.cookie = "cs2=sessionCookie; path=/; domain=" + partialHostname;
--- a/devtools/server/tests/browser/storage-secured-iframe.html
+++ b/devtools/server/tests/browser/storage-secured-iframe.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 Iframe for testing multiple host detetion in storage actor
 -->
 <head>
   <meta charset="utf-8">
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 document.cookie = "sc1=foobar;";
 localStorage.setItem("iframe-s-ls1", "foobar");
 sessionStorage.setItem("iframe-s-ss1", "foobar-2");
 
 let idbGenerator = function*() {
   let request = indexedDB.open("idb-s1", 1);
   request.onerror = function() {
--- a/devtools/server/tests/browser/storage-updates.html
+++ b/devtools/server/tests/browser/storage-updates.html
@@ -3,17 +3,17 @@
 <!--
 Bug 965872 - Storage inspector actor with cookies, local storage and session storage.
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector blank html for tests</title>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 "use strict";
 window.addCookie = function(name, value, path, domain, expires, secure) {
   let cookieString = name + "=" + value + ";";
   if (path) {
     cookieString += "path=" + path + ";";
   }
   if (domain) {
     cookieString += "domain=" + domain + ";";
--- a/devtools/server/tests/browser/stylesheets-nested-iframes.html
+++ b/devtools/server/tests/browser/stylesheets-nested-iframes.html
@@ -7,17 +7,17 @@
     p {
       padding: 1em;
     }
   </style>
 </head>
 <body>
   <p>A test page with nested iframes</p>
   <iframe></iframe>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
     let iframe = document.querySelector("iframe");
     let i = parseInt(location.href.split("?")[1]) || 1;
 
     // The frame can't have the same src URL as any of its ancestors.
     // This will not infinitely recurse because a frame won't get a content
     // document once it's nested deeply enough.
     iframe.src = location.href.split("?")[0] + "?" + (++i);
   </script>
--- a/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
+++ b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 Debugger.Source.prototype.introductionType should return 'eventHandler' for
 JavaScrip appearing in an inline event handler attribute.
 -->
 <head>
   <meta charset="utf-8">
   <title>Debugger.Source.prototype.introductionType should identify event handlers</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
+  <script type="application/javascript" src="inspector-helpers.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 
 Components.utils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
--- a/devtools/server/tests/mochitest/test_animation_actor-lifetime.html
+++ b/devtools/server/tests/mochitest/test_animation_actor-lifetime.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1247243
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1247243</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const Ci = Components.interfaces;
   const {AnimationsFront} = require("devtools/shared/fronts/animation");
   const {InspectorFront} = require("devtools/shared/fronts/inspector");
 
   SimpleTest.waitForExplicitFinish();
 
   let gWalker = null;
--- a/devtools/server/tests/mochitest/test_connectToChild.html
+++ b/devtools/server/tests/mochitest/test_connectToChild.html
@@ -6,17 +6,17 @@ Bug 966991 - Test DebuggerServer.connect
 <head>
   <meta charset="utf-8">
   <title>Mozilla Bug</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 let Cu = Components.utils;
 let Cc = Components.classes;
 let Ci = Components.interfaces;
 
 let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 let { DebuggerClient } = require("devtools/shared/client/main");
 let { DebuggerServer } = require("devtools/server/main");
--- a/devtools/server/tests/mochitest/test_css-logic-media-queries.html
+++ b/devtools/server/tests/mochitest/test_css-logic-media-queries.html
@@ -19,17 +19,17 @@ Test that css-logic handles media-querie
       div {
         width: 200px;
       }
     }
   </style>
 </head>
 <body>
   <div></div>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   window.onload = function() {
     var { classes: Cc, utils: Cu, interfaces: Ci } = Components;
     const DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"]
       .getService(Ci.inIDOMUtils);
 
     var {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
     var Services = require("Services");
--- a/devtools/server/tests/mochitest/test_css-logic-specificity.html
+++ b/devtools/server/tests/mochitest/test_css-logic-specificity.html
@@ -4,17 +4,17 @@
 Test that css-logic calculates CSS specificity properly
 -->
 <head>
   <meta charset="utf-8">
   <title>Test css-logic specificity</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 </head>
 <body style="background:blue;">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   window.onload = function() {
     var {utils: Cu, classes: Cc, interfaces: Ci} = Components;
 
     const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
     const {CssLogic, CssSelector} = require("devtools/server/css-logic");
     const DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"]
                        .getService(Ci.inIDOMUtils);
--- a/devtools/server/tests/mochitest/test_css-logic.html
+++ b/devtools/server/tests/mochitest/test_css-logic.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const {CssLogic} = require("devtools/server/css-logic");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 addTest(function getComputedStyle() {
--- a/devtools/server/tests/mochitest/test_css-properties.html
+++ b/devtools/server/tests/mochitest/test_css-properties.html
@@ -3,18 +3,18 @@
 <!--
 Bug 1265798 - Replace inIDOMUtils.cssPropertyIsShorthand
 -->
 <head>
   <meta charset="utf-8">
   <title>Test CSS Properties Actor</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const { initCssProperties, getCssProperties } =
     require("devtools/shared/fronts/css-properties");
 
   function promiseAttachUrl (url) {
     return new Promise((resolve, reject) => {
       attachURL(url, function(err, client, tab, doc) {
         if (err) {
--- a/devtools/server/tests/mochitest/test_director.html
+++ b/devtools/server/tests/mochitest/test_director.html
@@ -7,18 +7,18 @@ https://bugzilla.mozilla.org/show_bug.cg
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-  <script type="application/javascript;version=1.8" src="./director-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="./director-helpers.js"></script>
+  <script type="application/javascript">
 const WAIT_EVENT_TIMEOUT = 3000;
 
 window.onload = function() {
   Task.spawn(function* () {
     SimpleTest.waitForExplicitFinish();
 
     var tests = [
       runDirectorRegistryActorTest
--- a/devtools/server/tests/mochitest/test_director_connectToChild.html
+++ b/devtools/server/tests/mochitest/test_director_connectToChild.html
@@ -7,18 +7,18 @@ https://bugzilla.mozilla.org/show_bug.cg
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-  <script type="application/javascript;version=1.8" src="./director-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="./director-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   Task.spawn(function* () {
     SimpleTest.waitForExplicitFinish();
 
     var tests = [
       runPropagateDirectorScriptsToChildTest,
     ].map((testCase) => {
       return function* () {
--- a/devtools/server/tests/mochitest/test_framerate_04.html
+++ b/devtools/server/tests/mochitest/test_framerate_04.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 Bug 1023018 - Tests if the framerate actor keeps recording after navigations.
 -->
 <head>
   <meta charset="utf-8">
   <title>Framerate actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
+  <script type="application/javascript" src="inspector-helpers.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_framerate_06.html
+++ b/devtools/server/tests/mochitest/test_framerate_06.html
@@ -2,17 +2,17 @@
 <html>
 <!--
 Bug 1171489 - Tests if the framerate actor does not record timestamps from multiple frames. 
 -->
 <head>
   <meta charset="utf-8">
   <title>Framerate actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
+  <script type="application/javascript" src="inspector-helpers.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
 <script>
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_getProcess.html
+++ b/devtools/server/tests/mochitest/test_getProcess.html
@@ -6,17 +6,17 @@ Bug 1060093 - Test DebuggerServer.getPro
 <head>
   <meta charset="utf-8">
   <title>Mozilla Bug</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 let Cu = Components.utils;
 let Cc = Components.classes;
 let Ci = Components.interfaces;
 
 let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
 let {DebuggerClient} = require("devtools/shared/client/main");
 let {DebuggerServer} = require("devtools/server/main");
--- a/devtools/server/tests/mochitest/test_inspector-anonymous.html
+++ b/devtools/server/tests/mochitest/test_inspector-anonymous.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=777674
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 777674</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const {InspectorFront} =
     require("devtools/shared/fronts/inspector");
   const {_documentWalker} =
     require("devtools/server/actors/inspector");
   const nodeFilterConstants =
     require("devtools/shared/dom-node-filter-constants");
   const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
--- a/devtools/server/tests/mochitest/test_inspector-changeattrs.html
+++ b/devtools/server/tests/mochitest/test_inspector-changeattrs.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-changevalue.html
+++ b/devtools/server/tests/mochitest/test_inspector-changevalue.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const Ci = Components.interfaces;
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
--- a/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
+++ b/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1121528
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1121528</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker, gDoc;
--- a/devtools/server/tests/mochitest/test_inspector-duplicate-node.html
+++ b/devtools/server/tests/mochitest/test_inspector-duplicate-node.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1208864
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1208864</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-hide.html
+++ b/devtools/server/tests/mochitest/test_inspector-hide.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector-insert.html
+++ b/devtools/server/tests/mochitest/test_inspector-insert.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
+++ b/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
+++ b/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-mutations-events.html
+++ b/devtools/server/tests/mochitest/test_inspector-mutations-events.html
@@ -3,18 +3,18 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1157469
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1157469</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 
 window.onload = function() {
 
   const Cu = Components.utils;
   const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
   const {InspectorFront} = require("devtools/shared/fronts/inspector");
 
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
+++ b/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-mutations-value.html
+++ b/devtools/server/tests/mochitest/test_inspector-mutations-value.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 const testSummaryLength = 10;
--- a/devtools/server/tests/mochitest/test_inspector-pick-color.html
+++ b/devtools/server/tests/mochitest/test_inspector-pick-color.html
@@ -6,18 +6,18 @@ methods and that when a color is picked 
 the eyedropper is dimissed, the color-pick-canceled event is emitted.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1262439
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1262439</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const Cu = Components.utils;
   Cu.import("resource://devtools/shared/Loader.jsm");
   const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
   const {InspectorFront} = devtools.require("devtools/shared/fronts/inspector");
   const {console} = Cu.import("resource://gre/modules/Console.jsm", {});
 
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
+++ b/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 const DOMUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"].
                    getService(Components.interfaces.inIDOMUtils);
 
 const KNOWN_PSEUDOCLASSES = [':hover', ':active', ':focus']
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-release.html
+++ b/devtools/server/tests/mochitest/test_inspector-release.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector-reload.html
+++ b/devtools/server/tests/mochitest/test_inspector-reload.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-remove.html
+++ b/devtools/server/tests/mochitest/test_inspector-remove.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector-resize.html
+++ b/devtools/server/tests/mochitest/test_inspector-resize.html
@@ -4,18 +4,18 @@
 Test that the inspector actor emits "resize" events when the page is resized.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1222409
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1222409</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const Cu = Components.utils;
   const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
   const promise = require("promise");
   const {InspectorFront} = require("devtools/shared/fronts/inspector");
   const {console} = Cu.import("resource://gre/modules/Console.jsm", {});
 
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-resolve-url.html
+++ b/devtools/server/tests/mochitest/test_inspector-resolve-url.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=921102
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 921102</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspector;
--- a/devtools/server/tests/mochitest/test_inspector-retain.html
+++ b/devtools/server/tests/mochitest/test_inspector-retain.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
+++ b/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=901250
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 901250</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector-search-front.html
+++ b/devtools/server/tests/mochitest/test_inspector-search-front.html
@@ -3,18 +3,18 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=835896
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 835896</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const Cu = Components.utils;
   const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
   const promise = require("promise");
   const {InspectorFront} = require("devtools/shared/fronts/inspector");
   const {console} = Cu.import("resource://gre/modules/Console.jsm", {});
 
   SimpleTest.waitForExplicitFinish();
--- a/devtools/server/tests/mochitest/test_inspector-search.html
+++ b/devtools/server/tests/mochitest/test_inspector-search.html
@@ -3,18 +3,18 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=835896
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 835896</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 window.onload = function() {
   const Cu = Components.utils;
   const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
   const promise = require("promise");
   const {InspectorFront} = require("devtools/shared/fronts/inspector");
   const {WalkerSearch, WalkerIndex} =
     require("devtools/server/actors/utils/walker-search");
   const {console} = Cu.import("resource://gre/modules/Console.jsm", {});
--- a/devtools/server/tests/mochitest/test_inspector-traversal.html
+++ b/devtools/server/tests/mochitest/test_inspector-traversal.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gInspectee = null;
--- a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
@@ -10,18 +10,18 @@ Tests for InspectorActor.getImageData() 
 https://bugzilla.mozilla.org/show_bug.cgi?id=1192536
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1192536</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 
 const flags = require("devtools/shared/flags");
 const wasTesting = flags.testing;
 SimpleTest.registerCleanupFunction(() => flags.testing = wasTesting);
 
 const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
--- a/devtools/server/tests/mochitest/test_inspector_getImageData.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageData.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=932937
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 932937</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
@@ -9,18 +9,18 @@ Tests for InspectorActor.getImageDataFro
 https://bugzilla.mozilla.org/show_bug.cgi?id=1192536
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1192536</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 
 const flags = require("devtools/shared/flags");
 const wasTesting = flags.testing;
 SimpleTest.registerCleanupFunction(() => flags.testing = wasTesting);
 
 const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
--- a/devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html
+++ b/devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1155653
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1155653</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/shared/fronts/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker;
--- a/devtools/server/tests/mochitest/test_memory.html
+++ b/devtools/server/tests/mochitest/test_memory.html
@@ -6,17 +6,17 @@ Bug 923275 - Add a memory monitor widget
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     var measurement = yield memory.measure();
     ok(measurement.total > 0, "total memory is valid");
--- a/devtools/server/tests/mochitest/test_memory_allocations_01.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_01.html
@@ -6,17 +6,17 @@ Bug 1067491 - Test recording allocations
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_02.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_02.html
@@ -6,17 +6,17 @@ Bug 1132764 - Test controlling the maxim
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_03.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_03.html
@@ -6,17 +6,17 @@ Bug 1067491 - Test that frames keep the 
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_04.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_04.html
@@ -6,17 +6,17 @@ Bug 1068171 - Test controlling the memor
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_05.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_05.html
@@ -6,17 +6,17 @@ Bug 1068144 - Test getting the timestamp
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_06.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_06.html
@@ -6,17 +6,17 @@ Bug 1132764 - Test controlling the maxim
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_allocations_07.html
+++ b/devtools/server/tests/mochitest/test_memory_allocations_07.html
@@ -6,17 +6,17 @@ Bug 1192335 - Test getting the byte size
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_attach_01.html
+++ b/devtools/server/tests/mochitest/test_memory_attach_01.html
@@ -6,17 +6,17 @@ Bug 960671 - Test attaching and detachin
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
     ok(true, "Shouldn't have gotten an error attaching.");
--- a/devtools/server/tests/mochitest/test_memory_attach_02.html
+++ b/devtools/server/tests/mochitest/test_memory_attach_02.html
@@ -6,17 +6,17 @@ Bug 960671 - Test attaching and detachin
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
 
     var e = null;
--- a/devtools/server/tests/mochitest/test_memory_census.html
+++ b/devtools/server/tests/mochitest/test_memory_census.html
@@ -6,17 +6,17 @@ Bug 1067491 - Test taking a census over 
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
     yield memory.attach();
 
--- a/devtools/server/tests/mochitest/test_memory_gc_01.html
+++ b/devtools/server/tests/mochitest/test_memory_gc_01.html
@@ -6,17 +6,17 @@ Bug 1067491 - Test forcing a gc.
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
 
     do {
--- a/devtools/server/tests/mochitest/test_memory_gc_events.html
+++ b/devtools/server/tests/mochitest/test_memory_gc_events.html
@@ -6,17 +6,17 @@ Bug 1137527 - Test receiving GC events f
 <head>
   <meta charset="utf-8">
   <title>Memory monitoring actor test</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script src="memory-helpers.js" type="application/javascript"></script>
 <script>
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
 
   var event = require("sdk/event/core");
 
   Task.spawn(function* () {
     var { memory, client } = yield startServerAndGetSelectedTabMemory();
--- a/devtools/server/tests/mochitest/test_setupInParentChild.html
+++ b/devtools/server/tests/mochitest/test_setupInParentChild.html
@@ -6,17 +6,17 @@ Bug 1181100 - Test DebuggerServerConnect
 <head>
   <meta charset="utf-8">
   <title>Mozilla Bug</title>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <pre id="test">
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 let Cu = Components.utils;
 let Cc = Components.classes;
 let Ci = Components.interfaces;
 
 let {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
 let {DebuggerClient} = require("devtools/shared/client/main");
 let {DebuggerServer} = require("devtools/server/main");
--- a/devtools/server/tests/mochitest/test_styles-applied.html
+++ b/devtools/server/tests/mochitest/test_styles-applied.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_styles-computed.html
+++ b/devtools/server/tests/mochitest/test_styles-computed.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/server/tests/mochitest/test_styles-layout.html
+++ b/devtools/server/tests/mochitest/test_styles-layout.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <meta charset="utf-8">
 <title>Test for Bug 1175040 - PageStyleActor.getLayout</title>
 <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-<script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript" src="inspector-helpers.js"></script>
+<script type="application/javascript">
 "use strict";
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 };
 
 let gWalker = null;
--- a/devtools/server/tests/mochitest/test_styles-matched.html
+++ b/devtools/server/tests/mochitest/test_styles-matched.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 const CssLogic = require("devtools/shared/inspector/css-logic");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
--- a/devtools/server/tests/mochitest/test_styles-modify.html
+++ b/devtools/server/tests/mochitest/test_styles-modify.html
@@ -4,18 +4,18 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
--- a/devtools/server/tests/mochitest/test_styles-svg.html
+++ b/devtools/server/tests/mochitest/test_styles-svg.html
@@ -5,18 +5,18 @@ https://bugzilla.mozilla.org/show_bug.cg
 Bug 921191 - allow inspection/editing of SVG elements' CSS properties
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript" src="inspector-helpers.js"></script>
+  <script type="application/javascript">
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
 }
 
 var gWalker = null;
--- a/devtools/shared/jsbeautify/src/beautify-tests.js
+++ b/devtools/shared/jsbeautify/src/beautify-tests.js
@@ -1731,18 +1731,18 @@ function run_beautifier_tests(test_obj, 
     bth('<script type="text/javascript">var foo = "bar";</script>',
       '<script type="text/javascript">\n' +
       '    var foo = "bar";\n' +
       '</script>');     
     bth('<script type="application/javascript">var foo = "bar";</script>',
       '<script type="application/javascript">\n' +
       '    var foo = "bar";\n' +
       '</script>');
-    bth('<script type="application/javascript;version=1.8">var foo = "bar";</script>',
-      '<script type="application/javascript;version=1.8">\n' +
+    bth('<script type="application/javascript">var foo = "bar";</script>',
+      '<script type="application/javascript">\n' +
       '    var foo = "bar";\n' +
       '</script>');
     bth('<script type="application/x-javascript">var foo = "bar";</script>',
       '<script type="application/x-javascript">\n' +
       '    var foo = "bar";\n' +
       '</script>');
     bth('<script type="application/ecmascript">var foo = "bar";</script>',
       '<script type="application/ecmascript">\n' +
--- a/devtools/shared/platform/content/test/test_clipboard.html
+++ b/devtools/shared/platform/content/test/test_clipboard.html
@@ -6,27 +6,27 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 1290230 - clipboard helpers</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
 
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 var exports = {}
 </script>
 
-  <script type="application/javascript;version=1.8"
+  <script type="application/javascript"
 	  src="resource://devtools/shared/platform/content/clipboard.js"></script>
 
 </head>
 <body onload="do_tests()">
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 "use strict";
 
 const RESULT = "lark bunting";
 
 function doCopy(e) {
   console.log(e.isTrusted);
   copyString(RESULT);
 }
--- a/devtools/shared/qrcode/tests/mochitest/test_decode.html
+++ b/devtools/shared/qrcode/tests/mochitest/test_decode.html
@@ -4,17 +4,17 @@
 Test decoding a simple message
 -->
 <head>
   <meta charset="utf-8">
   <title>Test decoding a simple message</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 window.onload = function() {
   const { utils: Cu } = Components;
   const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 
   const QR = require("devtools/shared/qrcode/index");
 
   SimpleTest.waitForExplicitFinish();
 
--- a/devtools/shared/tests/mochitest/test_css-logic-getCssPath.html
+++ b/devtools/shared/tests/mochitest/test_css-logic-getCssPath.html
@@ -4,17 +4,17 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1323700
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1323700</title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const CssLogic = require("devtools/shared/inspector/css-logic");
 
 var _tests = [];
 function addTest(test) {
   _tests.push(test);
--- a/devtools/shared/tests/mochitest/test_css-logic.html
+++ b/devtools/shared/tests/mochitest/test_css-logic.html
@@ -4,17 +4,17 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug </title>
 
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const CssLogic = require("devtools/shared/inspector/css-logic");
 
 var _tests = [];
 function addTest(test) {
   _tests.push(test);
--- a/devtools/shared/tests/mochitest/test_devtools_extensions.html
+++ b/devtools/shared/tests/mochitest/test_devtools_extensions.html
@@ -10,17 +10,17 @@
     <meta charset="utf8">
     <title></title>
 
     <script type="application/javascript"
             src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css"
           href="chrome://mochikit/content/tests/SimpleTest/test.css">
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
       let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
       const contentGlobals  = require("devtools/server/content-globals");
       const Services = require("Services");
       const tabs = require('sdk/tabs');
       const { getMostRecentBrowserWindow, getInnerId } = require('sdk/window/utils');
       const { PageMod } = require('sdk/page-mod');
--- a/devtools/shared/tests/mochitest/test_eventemitter_basic.html
+++ b/devtools/shared/tests/mochitest/test_eventemitter_basic.html
@@ -13,17 +13,17 @@
     <script type="application/javascript"
             src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
     <link rel="stylesheet" type="text/css"
           href="chrome://mochikit/content/tests/SimpleTest/test.css">
   </head>
 
   <body>
 
-    <script type="application/javascript;version=1.8">
+    <script type="application/javascript">
       "use strict";
 
       const { utils: Cu } = Components;
       const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
       const promise = require("promise");
       const EventEmitter = require("devtools/shared/event-emitter");
       const { Task } = require("devtools/shared/task");
 
--- a/devtools/shared/webconsole/test/test_basics.html
+++ b/devtools/shared/webconsole/test/test_basics.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Basic Web Console Actor tests</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Basic Web Console Actor tests</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
   attachConsoleToTab(["PageError"], onStartPageError);
 }
--- a/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
+++ b/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for Bug 819670 - Web console object inspection does not handle native getters throwing very well</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for Bug 819670 - Web console object inspection does not handle native getters throwing very well</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
   attachConsoleToTab([], onAttach);
 }
 
--- a/devtools/shared/webconsole/test/test_cached_messages.html
+++ b/devtools/shared/webconsole/test/test_cached_messages.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for cached messages</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for cached messages</p>
 
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 var ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
                           .getService(Ci.nsIConsoleAPIStorage);
 let expectedConsoleCalls = [];
 let expectedPageErrors = [];
 
 function doPageErrors() {
   Services.console.reset();
 
@@ -89,17 +89,17 @@ function doConsoleCalls() {
       functionName: "doConsoleCalls",
       timeStamp: /^\d+$/,
       arguments: ["foobarBaz-warn", { type: "object", actor: /[a-z]/ }],
     },
   ];
 }
 </script>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 var {ConsoleServiceListener, ConsoleAPIListener} =
   require("devtools/server/actors/utils/webconsole-listeners");
 
 let consoleAPIListener, consoleServiceListener;
 let consoleAPICalls = 0;
 let pageErrors = 0;
 
--- a/devtools/shared/webconsole/test/test_commands_other.html
+++ b/devtools/shared/webconsole/test/test_commands_other.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the other command helpers</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the querySelector / querySelectorAll helpers</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 let gState;
 let gWin;
 let tests;
 
 function evaluateJS(input) {
   return new Promise((resolve) => gState.client.evaluateJS(input, resolve));
 }
--- a/devtools/shared/webconsole/test/test_commands_registration.html
+++ b/devtools/shared/webconsole/test/test_commands_registration.html
@@ -1,23 +1,23 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for Web Console commands registration.</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for Web Console commands registration.</p>
 <p id="quack"></p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gState;
 let tests;
 
 let {WebConsoleCommands} = require("devtools/server/actors/utils/webconsole-utils");
 
 function evaluateJS(input) {
--- a/devtools/shared/webconsole/test/test_console_serviceworker.html
+++ b/devtools/shared/webconsole/test/test_console_serviceworker.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the Console API and Service Workers</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the Console API and Service Workers</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 // Utils functions
 function withFrame(url) {
   return new Promise(resolve => {
     let iframe = document.createElement("iframe");
     iframe.onload = function () {
       resolve(iframe);
--- a/devtools/shared/webconsole/test/test_console_serviceworker_cached.html
+++ b/devtools/shared/webconsole/test/test_console_serviceworker_cached.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for getCachedMessages and Service Workers</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for getCachedMessages and Service Workers</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let BASE_URL = "https://example.com/chrome/devtools/shared/webconsole/test/";
 let SERVICE_WORKER_URL = BASE_URL + "helper_serviceworker.js";
 let FRAME_URL = BASE_URL + "sandboxed_iframe.html";
 
 let firstTabExpectedCalls = [
   {
--- a/devtools/shared/webconsole/test/test_console_styling.html
+++ b/devtools/shared/webconsole/test/test_console_styling.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for console.log styling with %c</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for console.log styling with %c</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedConsoleCalls = [];
 
 function doConsoleCalls(aState)
 {
   top.console.log("%cOne formatter with no styles");
   top.console.log("%cOne formatter", "color: red");
--- a/devtools/shared/webconsole/test/test_console_worker.html
+++ b/devtools/shared/webconsole/test/test_console_worker.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the Console API and Workers</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the Console API and Workers</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedCachedConsoleCalls = [
     {
       level: "log",
       filename: /console-test-worker/,
       arguments: ['Log from worker init'],
     },
--- a/devtools/shared/webconsole/test/test_consoleapi.html
+++ b/devtools/shared/webconsole/test/test_consoleapi.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the Console API</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the Console API</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedConsoleCalls = [];
 
 function doConsoleCalls(aState)
 {
   let longString = (new Array(DebuggerServer.LONG_STRING_LENGTH + 2)).join("a");
 
--- a/devtools/shared/webconsole/test/test_consoleapi_innerID.html
+++ b/devtools/shared/webconsole/test/test_consoleapi_innerID.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the innerID property of the Console API</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the Console API</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedConsoleCalls = [];
 
 function doConsoleCalls(aState)
 {
   let { ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm", {});
   let console = new ConsoleAPI({
--- a/devtools/shared/webconsole/test/test_file_uri.html
+++ b/devtools/shared/webconsole/test/test_file_uri.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for file activity tracking</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for file activity tracking</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
 let gState;
 let gTmpFile;
 
--- a/devtools/shared/webconsole/test/test_jsterm.html
+++ b/devtools/shared/webconsole/test/test_jsterm.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for JavaScript terminal functionality</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for JavaScript terminal functionality</p>
 
 <iframe id="content-iframe" src="http://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gState;
 
 let {MAX_AUTOCOMPLETE_ATTEMPTS,MAX_AUTOCOMPLETIONS} = require("devtools/shared/webconsole/js-property-provider");
 
 // This test runs all of its assertions twice - once with
 // evaluateJS and once with evaluateJSAsync.
--- a/devtools/shared/webconsole/test/test_jsterm_autocomplete.html
+++ b/devtools/shared/webconsole/test/test_jsterm_autocomplete.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for JavaScript terminal functionality</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for JavaScript terminal autocomplete functionality</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gState;
 let {MAX_AUTOCOMPLETE_ATTEMPTS,MAX_AUTOCOMPLETIONS} = require("devtools/shared/webconsole/js-property-provider");
 
 function evaluateJS(input, options = {}) {
   return new Promise((resolve, reject) => {
     gState.client.evaluateJSAsync(input, resolve, options);
--- a/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
+++ b/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the cd() function</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the cd() function</p>
 
 <iframe id="content-iframe" src="http://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gState;
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
--- a/devtools/shared/webconsole/test/test_jsterm_last_result.html
+++ b/devtools/shared/webconsole/test/test_jsterm_last_result.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the $_ getter</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the $_ getter</p>
 
 <iframe id="content-iframe" src="http://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 let gState;
 
 function evaluateJS(input, callback) {
   return new Promise((resolve, reject) => {
     gState.client.evaluateJSAsync(input, response => {
       if (callback) {
         callback(response);
--- a/devtools/shared/webconsole/test/test_jsterm_queryselector.html
+++ b/devtools/shared/webconsole/test/test_jsterm_queryselector.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the querySelector / querySelectorAll helpers</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the querySelector / querySelectorAll helpers</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 let gState;
 let gWin;
 
 function evaluateJS(input) {
   return new Promise((resolve) => gState.client.evaluateJS(input, resolve));
 }
 
--- a/devtools/shared/webconsole/test/test_network_get.html
+++ b/devtools/shared/webconsole/test/test_network_get.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the network actor (GET request)</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (GET request)</p>
 
 <iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
   attachConsoleToTab(["NetworkActivity"], onAttach);
 }
 
--- a/devtools/shared/webconsole/test/test_network_longstring.html
+++ b/devtools/shared/webconsole/test/test_network_longstring.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test that the network actor uses the LongStringActor</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test that the network actor uses the LongStringActor</p>
 
 <iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
   attachConsoleToTab(["NetworkActivity"], onAttach);
 }
--- a/devtools/shared/webconsole/test/test_network_post.html
+++ b/devtools/shared/webconsole/test/test_network_post.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the network actor (POST request)</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (POST request)</p>
 
 <iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
   attachConsoleToTab(["NetworkActivity"], onAttach);
 }
--- a/devtools/shared/webconsole/test/test_network_security-hpkp.html
+++ b/devtools/shared/webconsole/test/test_network_security-hpkp.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the network actor (HPKP detection)</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (HPKP detection)</p>
 
 <iframe src="https://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gCurrentTestCase = -1;
 const HPKP_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots";
 
 // Static pins tested by unit/test_security-info-static-hpkp.js.
 const TEST_CASES = [
   {
--- a/devtools/shared/webconsole/test/test_network_security-hsts.html
+++ b/devtools/shared/webconsole/test/test_network_security-hsts.html
@@ -1,24 +1,24 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the network actor (HSTS detection)</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (HSTS detection)</p>
 
 <iframe src="https://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let gCurrentTestCase = -1;
 const TEST_CASES = [
   {
     desc: "no HSTS",
     url: "https://example.com",
     usesHSTS: false,
--- a/devtools/shared/webconsole/test/test_nsiconsolemessage.html
+++ b/devtools/shared/webconsole/test/test_nsiconsolemessage.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for nsIConsoleMessages</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Make sure that nsIConsoleMessages are logged. See bug 859756.</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 "use strict";
 SimpleTest.waitForExplicitFinish();
 
 let expectedMessages = [];
 
 function startTest()
 {
   removeEventListener("load", startTest);
--- a/devtools/shared/webconsole/test/test_object_actor.html
+++ b/devtools/shared/webconsole/test/test_object_actor.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the object actor</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the object actor</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedProps = [];
 
 function startTest() {
   removeEventListener("load", startTest);
 
   attachConsoleToTab(["ConsoleAPI"], onAttach);
--- a/devtools/shared/webconsole/test/test_object_actor_native_getters.html
+++ b/devtools/shared/webconsole/test/test_object_actor_native_getters.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the native getters in object actors</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the native getters in object actors</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedProps = [];
 let expectedSafeGetters = [];
 
 function startTest()
 {
   removeEventListener("load", startTest);
--- a/devtools/shared/webconsole/test/test_object_actor_native_getters_lenient_this.html
+++ b/devtools/shared/webconsole/test/test_object_actor_native_getters_lenient_this.html
@@ -1,23 +1,23 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test that WebIDL attributes with the LenientThis extended attribute
          do not appear in the wrong objects</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the native getters in object actors</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
   attachConsoleToTab(["ConsoleAPI"], onAttach);
 }
--- a/devtools/shared/webconsole/test/test_page_errors.html
+++ b/devtools/shared/webconsole/test/test_page_errors.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for page errors</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for page errors</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let expectedPageErrors = [];
 
 function doPageErrors() {
   expectedPageErrors = {
     "document.body.style.color = 'fooColor';": {
       errorMessage: /fooColor/,
--- a/devtools/shared/webconsole/test/test_reflow.html
+++ b/devtools/shared/webconsole/test/test_reflow.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Test for the Reflow Activity</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for reflow events</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 let client;
 
 function generateReflow() {
   top.document.documentElement.style.display = "none";
   top.document.documentElement.getBoundingClientRect();
   top.document.documentElement.style.display = "block";
--- a/devtools/shared/webconsole/test/test_throw.html
+++ b/devtools/shared/webconsole/test/test_throw.html
@@ -1,22 +1,22 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
   <meta charset="utf8">
   <title>Web Console throw tests</title>
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript;version=1.8" src="common.js"></script>
+  <script type="text/javascript" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Web Console throw tests</p>
 
-<script class="testbody" type="text/javascript;version=1.8">
+<script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
   attachConsoleToTab([], onAttach);
 }
 
--- a/docshell/test/test_bfcache_plus_hash.html
+++ b/docshell/test/test_bfcache_plus_hash.html
@@ -11,17 +11,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=646641">Mozilla Bug 646641</a>
 <p id="display"></p>
 <div id="content" style="display: none">
   
 </div>
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 646641 **/
 
 /* 
  * In a popup (because navigating the main frame confuses Mochitest), do the
  * following:
  *
  *  * Call history.pushState().
--- a/docshell/test/test_bug385434.html
+++ b/docshell/test/test_bug385434.html
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=385434">Mozilla Bug 385434</a>
 <p id="display"></p>
 <div id="content">
   <iframe id="frame" style="height:100px; width:100px; border:0"></iframe>
   <div id="status" style="display: none"></div>
 </div>
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 385434 **/
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
 var gNumHashchanges = 0;
 var gCallbackOnIframeLoad = false;
 
--- a/docshell/test/test_bug475636.html
+++ b/docshell/test/test_bug475636.html
@@ -13,17 +13,17 @@ Test that refresh to data: URIs don't in
 <body onload="gen.next()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=475636">Mozilla Bug 475636</a>
 
 <div id="content" style="display: none">
   
 </div>
 <iframe id=loader></iframe>
 <pre id="test">
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 gen = runTests();
 
 window.private = 42;
 
 window.addEventListener("message", function(e) {
--- a/docshell/test/test_bug509055.html
+++ b/docshell/test/test_bug509055.html
@@ -11,17 +11,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=509055">Mozilla Bug 509055</a>
 <p id="display"></p>
 <div id="status"></div>
 <div id="content">
 </div>
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 509055 **/
 
 SimpleTest.waitForExplicitFinish();
 
 var gGen;
 
 function shortWait() {
--- a/docshell/test/test_bug511449.html
+++ b/docshell/test/test_bug511449.html
@@ -13,17 +13,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=511449">Mozilla Bug 511449</a>
 <p id="display"></p>
 <div id="status"></div>
 <div id="content">
 </div>
 <input type="text" id="input">
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 511449 **/
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 window.addEventListener('load', runTest);
 
 var win = null;
--- a/docshell/test/test_bug551225.html
+++ b/docshell/test/test_bug551225.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 551225</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=551225">Mozilla Bug 551225</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 551225 **/
 
 obj = {
   a: new Date('1/1/2000'),
   b: /^foo$/,
   c: 'bar'
 };
--- a/docshell/test/test_bug590573.html
+++ b/docshell/test/test_bug590573.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 590573</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=590573">Mozilla Bug 590573</a>
 
-<script type='application/javascript;version=1.7'>
+<script type='application/javascript'>
 SimpleTest.waitForExplicitFinish();
 
 // Listen to the first callback, since this indicates that the page loaded.
 var page1LoadCallbackEnabled = true;
 function page1Load()
 {
   if (page1LoadCallbackEnabled) {
     page1LoadCallbackEnabled = false;
--- a/docshell/test/test_bug634834.html
+++ b/docshell/test/test_bug634834.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 634834</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=634834">Mozilla Bug 634834</a>
 
-<script type='application/javascript;version=1.7'>
+<script type='application/javascript'>
 SimpleTest.waitForExplicitFinish();
 
 function iframe_loaded() {
   var loadedAfterPushstate = false;
   $('iframe').onload = function() {
     loadedAfterPushstate = true;
   }
 
--- a/docshell/test/test_bug640387_1.html
+++ b/docshell/test/test_bug640387_1.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 640387</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=640387">Mozilla Bug 640387</a>
 
-<script type='application/javascript;version=1.7'>
+<script type='application/javascript'>
 SimpleTest.waitForExplicitFinish();
 
 function* test() {
   /* Spin the event loop so we get out of the onload handler. */
   SimpleTest.executeSoon(function() { gGen.next() });
   yield undefined;
 
   popup.history.pushState('', '', '#hash1');
--- a/docshell/test/test_bug640387_2.html
+++ b/docshell/test/test_bug640387_2.html
@@ -17,17 +17,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   http://example.com/#foo
 
 to
 
   http://example.com/
 
 via a non-history load, we do a true load, rather than a scroll. -->
 
-<script type='application/javascript;version=1.7'>
+<script type='application/javascript'>
 SimpleTest.waitForExplicitFinish();
 
 callbackOnLoad = false;
 function childLoad() {
   if (callbackOnLoad) {
     callbackOnLoad = false;
     gGen.next();
   }
--- a/docshell/test/test_bug653741.html
+++ b/docshell/test/test_bug653741.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 653741</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.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=653741">Mozilla Bug 653741</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 653741 **/
 SimpleTest.waitForExplicitFinish();
 
 function childLoad() {
   // Spin the event loop so we leave the onload handler.
   SimpleTest.executeSoon(childLoad2);
 }
--- a/docshell/test/test_bug662170.html
+++ b/docshell/test/test_bug662170.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 662170</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.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=662170">Mozilla Bug 662170</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /** Test for Bug 662170 **/
 SimpleTest.waitForExplicitFinish();
 
 function childLoad() {
   // Spin the event loop so we leave the onload handler.
   SimpleTest.executeSoon(childLoad2);
 }
--- a/docshell/test/test_bug669671.html
+++ b/docshell/test/test_bug669671.html
@@ -10,17 +10,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=669671">Mozilla Bug 669671</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /**
  * Test for Bug 669671.
  *
  * This is a bit complicated.  We have a script, file_bug669671.sjs, which counts
  * how many times it's loaded and returns that count in the body of an HTML
  * document.  For brevity, call this page X.
  *
--- a/docshell/test/test_bug680257.html
+++ b/docshell/test/test_bug680257.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 680257</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=680257">Mozilla Bug 680257</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 var popup = window.open('file_bug680257.html');
 
 // The popup will call into popupLoaded() once it loads.
 function popupLoaded() {
   // runTests() needs to be called from outside popupLoaded's onload handler.
--- a/docshell/test/test_bug728939.html
+++ b/docshell/test/test_bug728939.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 728939</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=728939">Mozilla Bug 728939</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 // Called when the popup finishes loading.
 function popupLoaded() {
   popup.location.hash = '#foo';
   is(popup.document.URL, popup.location.href, 'After hashchange.');
 
--- a/dom/archivereader/test/test_basic.html
+++ b/dom/archivereader/test/test_basic.html
@@ -4,17 +4,17 @@
 -->
 <html>
 <head>
   <title>Archive Reader Test</title>
 
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-  <script type="text/javascript;version=1.7">
+  <script type="text/javascript">
   function filesToCreate() {
     var binaryString = '504B03040A00000000002E6BF14000000000000000000000000005001C00746573742F555409000337CA055039CA055075780B' +
                        '000104E803000004E8030000504B03041400000008002D6BF1401780E15015000000580200000A001C00746573742F612E7478' +
                        '74555409000336CA05503ACA055075780B000104E803000004E8030000CB48CDC9C95728CF2FCA49E1CA18658FB2A9C4060050' +
                        '4B03040A00000000002F88EC40662E847010000000100000000A001C00746573742F622E74787455540900035A65FF4F42C505' +
                        '5075780B000104E803000004E803000068656C6C6F20776F726C642C2032210A504B01021E030A00000000002E6BF140000000' +
                        '000000000000000000050018000000000000001000FD4100000000746573742F555405000337CA055075780B000104E8030000' +
                        '04E8030000504B01021E031400000008002D6BF1401780E15015000000580200000A0018000000000001000000B4813F000000' +
@@ -210,17 +210,17 @@
     }
     handle5.onerror = function() {
       ok(false, "ArchiveReader.getFiles() should not return an 'error'");
       markTestDone();
     }
   }
 
   </script>
-  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+  <script type="text/javascript" src="helpers.js"></script>
 </head>
 
 <body onload="runTest();">
 <p id="display">
 </p>
 </body>
 
 </html>
--- a/dom/archivereader/test/test_nonUnicode.html
+++ b/dom/archivereader/test/test_nonUnicode.html
@@ -4,17 +4,17 @@
 -->
 <html>
 <head>
   <title>Archive Reader Non-Unicode Test</title>
 
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-  <script type="text/javascript;version=1.7">
+  <script type="text/javascript">
   function filesToCreate() {
     var binaryData = "";
     for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
       var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
       binaryData += String.fromCharCode(parseInt(hex,16));
     }
     return [ {name: "fileArchiveReader_nonUnicode.zip", data: binaryData} ];
   }
@@ -50,24 +50,24 @@
 
   function testSteps(files)
   {
     test1(files[0]);
   }
 
 
   </script>
-  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+  <script type="text/javascript" src="helpers.js"></script>
 
 </head>
 
 <body onload="runTest();">
 <p id="display">
 </p>
-<script type="text/javascript;version=1.7">
+<script type="text/javascript">
 var binaryString = '' +
 '504B0304140000000000255D094100000000000000000000000002000000912F504B03040A0000000000285D09416BB50A5A' +
 '010000000100000007000000912F9B2E747874D8504B01023F00140000000000255D09410000000000000000000000000200' +
 '24000000000000001000000000000000912F0A002000000000000100180062505F1A1376CD0162505F1A1376CD01FE3F8D59' +
 '1176CD01504B01023F000A0000000000285D09416BB50A5A0100000001000000070024000000000000002000000020000000' +
 '912F9B2E7478740A0020000000000001001800565EF41D1376CD0107BD73631176CD0107BD73631176CD01504B0506000000' +
 '0002000200AD000000460000000000';
 </script>
--- a/dom/archivereader/test/test_zip_in_zip.html
+++ b/dom/archivereader/test/test_zip_in_zip.html
@@ -4,17 +4,17 @@
 -->
 <html>
 <head>
   <title>Archive Reader Zip-In-Zip Test</title>
 
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-  <script type="text/javascript;version=1.7">
+  <script type="text/javascript">
   function filesToCreate() {
     var binaryData = "";
     for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
       var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
       binaryData += String.fromCharCode(parseInt(hex,16));
     }
     return [ {name: "fileArchiveReader_42.zip", data: binaryData} ];
   }
@@ -67,24 +67,24 @@
   function doLastLoop(blob)
   {
     ok(blob.size == 262144, "The last file size is wrong");
     ok(blob.name == 'empty.dat', "The last filename is wrong");
     finishTest();
   }
 
   </script>
-  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+  <script type="text/javascript" src="helpers.js"></script>
 
 </head>
 
 <body onload="runTest();">
 <p id="display">
 </p>
-<script type="text/javascript;version=1.7">
+<script type="text/javascript">
 var binaryString = '' +
 '504B03040A0000000000B0620E415F715F15970300009703000005001C00642E7A69705554090003AC262A50AC262A507578' +
 '0B000104E803000004E8030000504B03040A0000000000B0620E41CFE25F1EF7020000F702000005001C00632E7A69705554' +
 '090003AC262A50AC262A5075780B000104E803000004E8030000504B03040A0000000000B0620E4107D702A4570200005702' +
 '000005001C00622E7A69705554090003AC262A50AC262A5075780B000104E803000004E8030000504B03040A0000000000B0' +
 '620E417E45286DB7010000B701000005001C00612E7A69705554090003AC262A50AC262A5075780B000104E803000004E803' +
 '0000504B0304140000000800F7610E41784909B70F0100000000040009001C00656D7074792E646174555409000351252A50' +
 '57252A5075780B000104E803000004E8030000EDC13101000000C2A0FEA9E76D07A000000000000000000000000000000000' +
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -40,17 +40,17 @@ load 366200-1.xhtml
 load 369219-1.xhtml
 load 369413-1.html
 load 371124-1.html
 load 371124-2.html
 load 371466-1.xhtml
 load 372554-1.html
 load 375399-1.html
 load 377360-1.xhtml
-asserts-if(stylo,3) load 377960-1.html # bug 1324633
+load 377960-1.html
 load 377960-2.html
 load 384663-1.html
 load 386000-1.html
 load 386794-1.html
 skip-if(stylo) load 387460-1.html # bug 1323647
 asserts-if(stylo,2) load 395469-1.xhtml # bug 1324704
 asserts-if(stylo,3) load 395469-2.xhtml # bug 1324704
 load 398088-1.xul
@@ -94,17 +94,17 @@ load 529670.html
 load 535926-1.html
 load 543645.html
 load 551631-1.html
 load 552651.html
 load 554230-1.xhtml
 load 558973.html
 load 561981-1.html
 load 561981-2.html
-load 564079-1.html 
+load 564079-1.html
 load 564114.html
 load 565125-1.html
 load 575462.svg
 load 582601.html
 load 590395-1.html
 load 593302-1.html
 load 593302-2.html
 load 595606-1.html
@@ -207,9 +207,9 @@ load xhr_empty_datauri.html
 load xhr_html_nullresponse.html
 load 1230422.html
 load 1251361.html
 load 1304437.html
 pref(dom.IntersectionObserver.enabled,true) load 1324209.html
 pref(dom.IntersectionObserver.enabled,true) load 1326194-1.html
 pref(dom.IntersectionObserver.enabled,true) load 1326194-2.html
 pref(dom.IntersectionObserver.enabled,true) load 1332939.html
-pref(dom.webcomponents.enabled,true) load 1341693.html
\ No newline at end of file
+pref(dom.webcomponents.enabled,true) load 1341693.html
--- a/dom/base/test/chrome/test_bug418986-1.xul
+++ b/dom/base/test/chrome/test_bug418986-1.xul
@@ -10,17 +10,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
   <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=418986-1"
      target="_blank">Mozilla Bug 418986 (Part 1)</a>
 
-  <script type="application/javascript;version=1.7" src="bug418986-1.js"></script>
+  <script type="application/javascript" src="bug418986-1.js"></script>
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     window.onload = function() {
       test(false);
     };
   ]]></script>
   </body>
 </window>
--- a/dom/base/test/chrome/test_bug682305.html
+++ b/dom/base/test/chrome/test_bug682305.html
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body>
 <a target="_blank"
    href="https://bugzilla.mozilla.org/show_bug.cgi?id=682305">Mozilla Bug 682305</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 SimpleTest.waitForExplicitFinish();
 
 /*
  * Register a custom nsIProtocolHandler service
  * in order to be able to implement *and use* an 
  * nsIChannel component written in Javascript.
  */
 
--- a/dom/base/test/chrome/test_domparsing.xul
+++ b/dom/base/test/chrome/test_domparsing.xul
@@ -7,17 +7,17 @@
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
   <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=816410"
      target="_blank">Mozilla Bug 816410</a>
   </body>
 
   <!-- test code goes here -->
-  <script type="application/javascript;version=1.7"><![CDATA[
+  <script type="application/javascript"><![CDATA[
 "use strict";
 /** Test for Bug 816410 **/
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 
 function throws(a, type, message) {
   for (let fn of Array.isArray(a) ? a : [a]) {
--- a/dom/base/test/test_anchor_area_referrer.html
+++ b/dom/base/test/test_anchor_area_referrer.html
@@ -7,17 +7,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <!--
   Testing that anchor and area referrer attributes are honoured correctly
   * anchor tag with referrer attribute (generate-anchor-policy-test)
   https://bugzilla.mozilla.org/show_bug.cgi?id=1174913
   -->
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   const SJS = "://example.com/tests/dom/base/test/referrer_testserver.sjs?";
   const PARAMS = ["ATTRIBUTE_POLICY", "NEW_ATTRIBUTE_POLICY", "META_POLICY", "REL", "SCHEME_FROM", "SCHEME_TO"];
 
   const testCases = [
     {ACTION: ["generate-anchor-policy-test", "generate-area-policy-test"],
       TESTS: [
         {ATTRIBUTE_POLICY: 'unsafe-url',
@@ -111,15 +111,15 @@
 
         {ATTRIBUTE_POLICY: 'origin',
          NAME: 'origin-with-no-meta',
          META_POLICY: '',
          DESC: "origin (anchor) with no meta",
          RESULT: 'origin'}]}
   ];
   </script>
-  <script type="application/javascript;version=1.7" src="/tests/dom/base/test/referrer_helper.js"></script>
+  <script type="application/javascript" src="/tests/dom/base/test/referrer_helper.js"></script>
 </head>
 <body onload="tests.next();">
   <iframe id="testframe"></iframe>
 </body>
 </html>
 
--- a/dom/base/test/test_anchor_area_referrer_changing.html
+++ b/dom/base/test/test_anchor_area_referrer_changing.html
@@ -8,17 +8,17 @@
 
   <!--
   Testing that anchor and area referrer attributes are honoured correctly
   This test is split due to errors on b2g
   * testing setAttribute and .referrer (generate-anchor-changing-test)
   https://bugzilla.mozilla.org/show_bug.cgi?id=1174913
   -->
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   const SJS = "://example.com/tests/dom/base/test/referrer_testserver.sjs?";
   const PARAMS = ["ATTRIBUTE_POLICY", "NEW_ATTRIBUTE_POLICY", "META_POLICY", "REL"];
 
   const testCases = [
     {ACTION: ["generate-anchor-changing-policy-test-set-attribute", "generate-area-changing-policy-test-set-attribute"],
       TESTS: [
         {ATTRIBUTE_POLICY: 'unsafe-url',
@@ -52,15 +52,15 @@
          NEW_ATTRIBUTE_POLICY: 'unsafe-url',
          NAME: 'unsafe-url-no-referrer-with-origin-in-meta-rel',
          META_POLICY: 'origin',
          DESC: "unsafe-url (anchor, orginally no-referrer) with origin in meta and rel=noreferrer",
          RESULT: 'none',
          REL: 'noreferrer'}]}
   ];
   </script>
-  <script type="application/javascript;version=1.7" src="/tests/dom/base/test/referrer_helper.js"></script>
+  <script type="application/javascript" src="/tests/dom/base/test/referrer_helper.js"></script>
 </head>
 <body onload="tests.next();">
   <iframe id="testframe"></iframe>
 </body>
 </html>
 
--- a/dom/base/test/test_anchor_area_referrer_invalid.html
+++ b/dom/base/test/test_anchor_area_referrer_invalid.html
@@ -7,17 +7,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <!--
   Testing that anchor and area referrer attributes are honoured correctly
   * anchor tag with invalid referrer attributes
   https://bugzilla.mozilla.org/show_bug.cgi?id=1174913
   -->
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   const SJS = "://example.com/tests/dom/base/test/referrer_testserver.sjs?";
   const PARAMS = ["ATTRIBUTE_POLICY", "NEW_ATTRIBUTE_POLICY", "META_POLICY", "REL", , "SCHEME_FROM", "SCHEME_TO"];
 
   const testCases = [
     {ACTION: ["generate-anchor-policy-test", "generate-area-policy-test"],
       TESTS: [
         // setting invalid refer values -> we expect either full referrer (default)
@@ -60,15 +60,15 @@
          NAME: 'origin-when-cross-origin-with-origin-in-meta',
          META_POLICY: 'origin',
          SCHEME_FROM: 'https',
          SCHEME_TO: 'http',
          DESC: "origin-when-cross-origin (anchor) with origin in meta",
          RESULT: 'origin'}]}
   ];
   </script>
-  <script type="application/javascript;version=1.7" src="/tests/dom/base/test/referrer_helper.js"></script>
+  <script type="application/javascript" src="/tests/dom/base/test/referrer_helper.js"></script>
 </head>
 <body onload="tests.next();">
   <iframe id="testframe"></iframe>
 </body>
 </html>
 
--- a/dom/base/test/test_anchor_area_referrer_rel.html
+++ b/dom/base/test/test_anchor_area_referrer_rel.html
@@ -7,17 +7,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <!--
   Testing that anchor and area referrer attributes are honoured correctly
   * anchor tag with referrer attribute with rel=noreferrer
   https://bugzilla.mozilla.org/show_bug.cgi?id=1174913
   -->
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   const SJS = "://example.com/tests/dom/base/test/referrer_testserver.sjs?";
   const PARAMS = ["ATTRIBUTE_POLICY", "NEW_ATTRIBUTE_POLICY", "META_POLICY", "REL"];
 
   const testCases = [
     {ACTION: ["generate-anchor-policy-test", "generate-area-policy-test"],
       TESTS: [
         // setting rel=noreferrer -> we expect no referrer
@@ -36,15 +36,15 @@
         {ATTRIBUTE_POLICY: 'origin',
          NAME: 'origin-with-no-meta-rel',
          META_POLICY: '',
          DESC: "origin (anchor) with no meta and rel=noreferrer",
          RESULT: 'none',
          REL: 'noreferrer'}]}
   ];
   </script>
-  <script type="application/javascript;version=1.7" src="/tests/dom/base/test/referrer_helper.js"></script>
+  <script type="application/javascript" src="/tests/dom/base/test/referrer_helper.js"></script>
 </head>
 <body onload="tests.next();">
   <iframe id="testframe"></iframe>
 </body>
 </html>
 
--- a/dom/base/test/test_anonymousContent_api.html
+++ b/dom/base/test/test_anonymousContent_api.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1020244 - Test the chrome-only AnonymousContent API</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=1020244">Mozilla Bug 1020244</a>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   // Testing the presence of the chrome-only API
   ok(!document.insertAnonymousContent,
     "Content document shouldn't have access to insertAnonymousContent");
   ok(!document.removeAnonymousContent,
     "Content document shouldn't have access to removeAnonymousContent");
 
   let chromeDocument = SpecialPowers.wrap(document);
--- a/dom/base/test/test_anonymousContent_append_after_reflow.html
+++ b/dom/base/test/test_anonymousContent_append_after_reflow.html
@@ -6,17 +6,17 @@
   <title>Test for Bug 1020244 - Make sure anonymous content still works after a reflow (after the canvasframe has been reconstructed)</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>
   <div id="test-element" style="color:red;">text content</div>
 </div>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
   info("Inserting anonymous content into the document frame");
   let chromeDocument = SpecialPowers.wrap(document);
   let testElement = document.querySelector("div");
   let anonymousContent = chromeDocument.insertAnonymousContent(testElement);
 
   info("Modifying the style of an element in the anonymous content");
   let style = anonymousContent.setAttributeForElement("test-element",
                                                       "style", "color:green;");
--- a/dom/base/test/test_anonymousContent_canvas.html
+++ b/dom/base/test/test_anonymousContent_canvas.html
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1212477">Mozilla Bug 1212477</a>
   <div>
     <div id="id" class="test">text content</div>
     <canvas id="canvas2d"></canvas>
     <canvas id="canvas-webgl"></canvas>
     <canvas id="canvas-foo"></canvas>
   </div>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
     let chromeDocument = SpecialPowers.wrap(document);
     let testElement = document.querySelector("div");
 
     let anonymousContent = chromeDocument.insertAnonymousContent(testElement);
 
     is(anonymousContent.getCanvasContext("id", "2d"), null,
         "Context is null for non-canvas elements");
 
--- a/dom/base/test/test_anonymousContent_insert.html
+++ b/dom/base/test/test_anonymousContent_insert.html
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <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=1020244">Mozilla Bug 1020244</a>
 <div>
   <div id="id" class="test">text content</div>
 </div>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
   const INSERTED_NB = 5;
 
   // Insert the same content several times
   let chromeDocument = SpecialPowers.wrap(document);
   let testElement = document.querySelector("div");
 
   let anonymousContents = [];
   for (let i = 0; i < INSERTED_NB; i ++) {
--- a/dom/base/test/test_anonymousContent_manipulate_content.html
+++ b/dom/base/test/test_anonymousContent_manipulate_content.html
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <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=1020244">Mozilla Bug 1020244</a>
 <div>
   <div id="test-element" class="test-class" test="test">text content</div>
 </div>
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
 
   // Insert content
   let chromeDocument = SpecialPowers.wrap(document);
   let testElement = document.querySelector("div");
   let anonymousContent = chromeDocument.insertAnonymousContent(testElement);
 
   // Test getting/setting text content.
   is(anonymousContent.getTextContentForElement("test-element"),
--- a/dom/base/test/test_anonymousContent_style_csp.html
+++ b/dom/base/test/test_anonymousContent_style_csp.html
@@ -6,17 +6,17 @@
   <title>Test for Bug 1185351 - Make sure that we don't enforce CSP on styles for AnonymousContent</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>
   <div id="test-element" style="color:red;">text content</div>
 </div>
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
   let chromeDocument = SpecialPowers.wrap(document);
   let testElement = document.querySelector("div");
   let anonymousContent = chromeDocument.insertAnonymousContent(testElement);
 
   let style = anonymousContent.setAttributeForElement("test-element",
                                                       "style", "color:green;");
 
   style = anonymousContent.getAttributeForElement("test-element", "style");
--- a/dom/base/test/test_anonymousContent_xul_window.xul
+++ b/dom/base/test/test_anonymousContent_xul_window.xul
@@ -8,17 +8,17 @@ Check that XUL windows aren't supported,
 <window title="Anonymous content in a XUL window"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml"></body>
   <box>This is a test box</box>
 
-  <script type="application/javascript;version=1.8">
+  <script type="application/javascript">
     // Insert content
     let testElement = document.querySelector("box");
 
     let didThrow = false;
     try {
       document.insertAnonymousContent(testElement);
     } catch (e) {
       didThrow = true;
--- a/dom/base/test/test_applet_alternate_content.html
+++ b/dom/base/test/test_applet_alternate_content.html
@@ -8,17 +8,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <title>Test for Bug 1200602</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/SpecialPowers.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=1200602">Mozilla Bug 1200602</a>
 <pre id="test">
-<script type="application/javascript;version=1.8">
+<script type="application/javascript">
 
 function test() {
   "use strict";
 
   const objLC = SpecialPowers.Ci.nsIObjectLoadingContent;
   let obj = document.createElement("applet");
   obj.appendChild(document.createTextNode("alternate content"));
   document.body.appendChild(obj);
--- a/dom/base/test/test_audioNotificationSilent_audioFile.html
+++ b/dom/base/test/test_audioNotificationSilent_audioFile.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Audio-playback should be inactive when input file is silent</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 var generator = runTest();
 var expectedPlaybackActive = null;
 
 var audio = new Audio();
 audio.src = "audioEndedDuringPlaying.webm";
--- a/dom/base/test/test_audioNotificationSilent_webAudio.html
+++ b/dom/base/test/test_audioNotificationSilent_webAudio.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Audio-playback should be inactive when web-audio is silent</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 var generator = runTest();
 var expectedPlaybackActive = null;
 var expectedPlaying = null;
 
 var ac = new AudioContext();
--- a/dom/base/test/test_bug1008126.html
+++ b/dom/base/test/test_bug1008126.html
@@ -15,17 +15,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1008126">Mozilla Bug 1008126</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 function translateChrome(uriStr) {
   const { Cc, Ci } = SpecialPowers;
   let ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
   let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
   let uri = ios.newURI(uriStr, null, ios.newURI(document.baseURI));
   return chromeReg.convertChromeURL(uri).spec;
 }
 
--- a/dom/base/test/test_bug1163743.html
+++ b/dom/base/test/test_bug1163743.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 <head>
   <meta charset="utf-8">
   <title>Test policies for Bug 1163743</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 var advance = function() { tests.next(); };
 
 /**
  * testing legacy support for origin-when-crossorigin (1163743)
  */
 var tests = (function*() {
--- a/dom/base/test/test_bug1165501.html
+++ b/dom/base/test/test_bug1165501.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 <head>
   <meta charset="utf-8">
   <title>Test policies for Bug 1165501</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 var advance = function() { tests.next(); };
 
 /**
  * testing if policy is overwritten if there are two meta statements (1165501)
  * XXX: would be nice to test this with CSP and meta as well
  */
--- a/dom/base/test/test_bug1198095.html
+++ b/dom/base/test/test_bug1198095.html
@@ -8,17 +8,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="text/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=1198095">Mozilla Bug 1198095</a>
 
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 
 var fileData1 = '1234567890';
 var fileData2 = '43210';
 var r, firstBlob;
 
 var openerURL = SimpleTest.getTestFileURL("file_bug1198095.js");
 
 var opener = SpecialPowers.loadChromeScript(openerURL);
--- a/dom/base/test/test_bug1281963.html
+++ b/dom/base/test/test_bug1281963.html
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/1281963
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"></p>
 <div id="content"></div>
 
-<script class="testbody" type="application/javascript;version=1.7">
+<script class="testbody" type="application/javascript">
 
 // __setPref(key, value)__.
 // Set a pref value asynchronously, returning a promise that resolves
 // when it succeeds.
 let setPref = function* (key, value) {
   return SpecialPowers.pushPrefEnv({"set": [[key, value]]});
 };
 
--- a/dom/base/test/test_bug345339.html
+++ b/dom/base/test/test_bug345339.html
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=345339">Mozilla Bug 345339</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
  <iframe id="testframe"
          src="http://mochi.test:8888/tests/dom/base/test/345339_iframe.html">
  </iframe>
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 /** Test for Bug 345339 **/
 SimpleTest.waitForExplicitFinish();
 
 const testData = "Test data\n";
 let file = new File([testData],
                     "345339_test.file",
                     { type: "text/plain" });
 
--- a/dom/base/test/test_bug418986-1.html
+++ b/dom/base/test/test_bug418986-1.html
@@ -3,17 +3,17 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=418986
 -->
 <head>
   <meta charset="utf-8">
   <title>Test 1/3 for Bug 418986 - Resist fingerprinting by preventing exposure of screen and system info</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript;version=1.7" src="chrome/bug418986-1.js"></script>
+  <script type="application/javascript" src="chrome/bug418986-1.js"></script>
 </head>
 <body>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=418986">Bug 418986</a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test"></pre>
   <script>
     window.onload = function() {
--- a/dom/base/test/test_bug544642.html
+++ b/dom/base/test/test_bug544642.html
@@ -6,17 +6,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=544642"
    target="_blank" >Mozilla Bug 544642</a>
 <p id="display"></p>
 <iframe id=iframe></iframe>
 <pre id="test">
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 SimpleTest.waitForExplicitFinish();
 var gen = runTest();
 
 addLoadEvent(function() { gen.next(); });
 
 function* runTest() {
   var iframe = $('iframe');
   iframe.onerror = function() { gen.next("error"); };
--- a/dom/base/test/test_bug585978.html
+++ b/dom/base/test/test_bug585978.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <title>Test for Bug 585978</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=585978">Mozilla Bug 585978</a>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 /* Test that if we have a unicode character in the middle of an ascii string,
    the unicode character survives translation into and out of a text node. */
 
 for (let i = 0; i < 128; i++) {
   let node = document.createTextNode('');
   let str = '';
   for (let j = 0; j < i; j++) {
--- a/dom/base/test/test_bug590812.html
+++ b/dom/base/test/test_bug590812.html
@@ -8,17 +8,17 @@
 </head>
 <body onload="runTest()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=590812">Mozilla Bug 590812</a>
 <p id="display"></p>
 <iframe src="http://noxul.example.com/tests/dom/base/test/file_bug590812.xml"></iframe>
 <iframe src="file_bug590812.xml"></iframe>
 <iframe src="file_bug590812-ref.xhtml"></iframe>
 <pre id="test">
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
   sNoXUL = snapshotWindow(window.frames[0], false);
   sWithXUL = snapshotWindow(window.frames[1], false);
   sRef = snapshotWindow(window.frames[2], false);
   let res;
--- a/dom/base/test/test_bug590870.html
+++ b/dom/base/test/test_bug590870.html
@@ -7,17 +7,17 @@
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="gen.next()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=590870">Mozilla Bug 590870</a>
 <p id="display"></p>
 <iframe id=iframe></iframe>
 <pre id="test">
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 window.addEventListener("message", function(e) { gen.next(e.data) });
 
 var gen = runTest();
 
 function* runTest() {
   var iframe = $('iframe');
--- a/dom/base/test/test_bug622088.html
+++ b/dom/base/test/test_bug622088.html
@@ -11,17 +11,17 @@
 <pre id="test">
 
 <iframe id='iframe' src='file_bug622088_inner.html'></iframe>
 
 <iframe id='dataWindow' src="data:text/html,<html><head>
 <script>function getXHRObject() { return new XMLHttpRequest(); }</script>
 </head><body onload='parent.dataWindowLoaded()'>Hello!!</body></html>"></iframe>
 
-<script class="testbody" type="application/javascript;version=1.8">
+<script class="testbody" type="application/javascript">
 
 // Bug 622088 - Test that XHR gives the referrer corresponding to the
 // dynamic script context.
 
 const kOriginalLocation = location.href;
 
 SimpleTest.waitForExplicitFinish();
 
--- a/dom/base/test/test_bug682592.html
+++ b/dom/base/test/test_bug682592.html
@@ -12,17 +12,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 </head>
 <body>
 <p id="display"></p>
 <div id="content">
 <iframe id="iframe-ref"></iframe>
 <iframe id="iframe-test"></iframe>
 </div>
 <pre id="test">
-<script class="testbody" type="text/javascript;version=1.7">
+<script class="testbody" type="text/javascript">
 /** Test for Bug 682592 **/
 
 /* 
    We want to check that bidi is detected correctly. So, we have a reference
    document where ltr is set explicitely with <bdo> element. Then, we compare
    it with test document.
 
    In mozilla, once bidi has been detected in a document, document always
--- a/dom/base/test/test_bug704320.html
+++ b/dom/base/test/test_bug704320.html
@@ -5,17 +5,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 704320</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 //generates URLs to test
 var generateURLArray = (function(from, to){
   const baseURL = '://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=';
   const schemeTo = '&scheme-to=';
 
   return [
     from + baseURL + from + schemeTo + to + '&policy=no-referrer-when-downgrade',
--- a/dom/base/test/test_bug704320_policyset.html
+++ b/dom/base/test/test_bug704320_policyset.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 <head>
   <meta charset="utf-8">
   <title>Test policies for Bug 704320</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 var advance = function() { tests.next(); };
 
 /**
  * This is the main test routine -- serialized by use of a generator.
  * It resets the counter, then performs two tests in sequence using
  * the same iframe.
--- a/dom/base/test/test_bug704320_policyset2.html
+++ b/dom/base/test/test_bug704320_policyset2.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 <head>
   <meta charset="utf-8">
   <title>Test policies for Bug 704320</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="referrerHelper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
-<script type="application/javascript;version=1.7">
+<script type="application/javascript">
 
 SimpleTest.waitForExplicitFinish();
 var advance = function() { tests.next(); };
 
 /**