Bug 876277 - Normalize formatting for non-test files and rename them to follow a nicer pattern, r=past
authorVictor Porof <vporof@mozilla.com>
Fri, 13 Sep 2013 16:23:16 +0300
changeset 147078 04c318f79c84e50a8a4c170e3b728b313adf956b
parent 147077 0cb94386602a48e9c51fb1366866a612414e18fa
child 147079 1f66a755177f5c0a34be410e39b4adab0590d9c1
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerspast
bugs876277
milestone26.0a1
Bug 876277 - Normalize formatting for non-test files and rename them to follow a nicer pattern, r=past
browser/devtools/debugger/test/addon1.xpi
browser/devtools/debugger/test/addon2.xpi
browser/devtools/debugger/test/binary_search.coffee
browser/devtools/debugger/test/binary_search.html
browser/devtools/debugger/test/binary_search.js
browser/devtools/debugger/test/binary_search.map
browser/devtools/debugger/test/blackboxing_blackboxme.js
browser/devtools/debugger/test/blackboxing_one.js
browser/devtools/debugger/test/blackboxing_three.js
browser/devtools/debugger/test/blackboxing_two.js
browser/devtools/debugger/test/browser_dbg_addon1.xpi
browser/devtools/debugger/test/browser_dbg_addon2.xpi
browser/devtools/debugger/test/browser_dbg_big-data.html
browser/devtools/debugger/test/browser_dbg_blackboxing.html
browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.html
browser/devtools/debugger/test/browser_dbg_cmd.html
browser/devtools/debugger/test/browser_dbg_cmd_break.html
browser/devtools/debugger/test/browser_dbg_conditional-breakpoints.html
browser/devtools/debugger/test/browser_dbg_debuggerstatement.html
browser/devtools/debugger/test/browser_dbg_displayName.html
browser/devtools/debugger/test/browser_dbg_frame-parameters.html
browser/devtools/debugger/test/browser_dbg_function-search-01.html
browser/devtools/debugger/test/browser_dbg_function-search-02.html
browser/devtools/debugger/test/browser_dbg_iframes.html
browser/devtools/debugger/test/browser_dbg_pause-exceptions.html
browser/devtools/debugger/test/browser_dbg_script-switching-02.html
browser/devtools/debugger/test/browser_dbg_script-switching.html
browser/devtools/debugger/test/browser_dbg_stack.html
browser/devtools/debugger/test/browser_dbg_tab1.html
browser/devtools/debugger/test/browser_dbg_tab2.html
browser/devtools/debugger/test/browser_dbg_update-editor-mode.html
browser/devtools/debugger/test/browser_dbg_watch-expressions.html
browser/devtools/debugger/test/browser_dbg_with-frame.html
browser/devtools/debugger/test/code_binary_search.coffee
browser/devtools/debugger/test/code_binary_search.js
browser/devtools/debugger/test/code_binary_search.map
browser/devtools/debugger/test/code_blackboxing_blackboxme.js
browser/devtools/debugger/test/code_blackboxing_one.js
browser/devtools/debugger/test/code_blackboxing_three.js
browser/devtools/debugger/test/code_blackboxing_two.js
browser/devtools/debugger/test/code_function-search-01.js
browser/devtools/debugger/test/code_function-search-02.js
browser/devtools/debugger/test/code_function-search-03.js
browser/devtools/debugger/test/code_location-changes.js
browser/devtools/debugger/test/code_math.js
browser/devtools/debugger/test/code_math.map
browser/devtools/debugger/test/code_math.min.js
browser/devtools/debugger/test/code_script-switching-01.js
browser/devtools/debugger/test/code_script-switching-02.js
browser/devtools/debugger/test/code_test-editor-mode
browser/devtools/debugger/test/doc_binary_search.html
browser/devtools/debugger/test/doc_blackboxing.html
browser/devtools/debugger/test/doc_cmd-break.html
browser/devtools/debugger/test/doc_cmd-dbg.html
browser/devtools/debugger/test/doc_conditional-breakpoints.html
browser/devtools/debugger/test/doc_editor-mode.html
browser/devtools/debugger/test/doc_empty-tab-01.html
browser/devtools/debugger/test/doc_empty-tab-02.html
browser/devtools/debugger/test/doc_event-listeners.html
browser/devtools/debugger/test/doc_frame-parameters.html
browser/devtools/debugger/test/doc_function-display-name.html
browser/devtools/debugger/test/doc_function-search.html
browser/devtools/debugger/test/doc_iframes.html
browser/devtools/debugger/test/doc_included-script.html
browser/devtools/debugger/test/doc_inline-debugger-statement.html
browser/devtools/debugger/test/doc_inline-script.html
browser/devtools/debugger/test/doc_large-array-buffer.html
browser/devtools/debugger/test/doc_minified.html
browser/devtools/debugger/test/doc_pause-exceptions.html
browser/devtools/debugger/test/doc_recursion-stack.html
browser/devtools/debugger/test/doc_script-switching-01.html
browser/devtools/debugger/test/doc_script-switching-02.html
browser/devtools/debugger/test/doc_step-out.html
browser/devtools/debugger/test/doc_watch-expressions.html
browser/devtools/debugger/test/doc_with-frame.html
browser/devtools/debugger/test/math.js
browser/devtools/debugger/test/math.map
browser/devtools/debugger/test/math.min.js
browser/devtools/debugger/test/minified.html
browser/devtools/debugger/test/test-editor-mode
browser/devtools/debugger/test/test-event-listeners.html
browser/devtools/debugger/test/test-function-search-01.js
browser/devtools/debugger/test/test-function-search-02.js
browser/devtools/debugger/test/test-function-search-03.js
browser/devtools/debugger/test/test-location-changes-bp.html
browser/devtools/debugger/test/test-location-changes-bp.js
browser/devtools/debugger/test/test-pause-exceptions-reload.html
browser/devtools/debugger/test/test-script-switching-01.js
browser/devtools/debugger/test/test-script-switching-02.js
browser/devtools/debugger/test/test-step-out.html
browser/devtools/debugger/test/testactors.js
rename from browser/devtools/debugger/test/browser_dbg_addon1.xpi
rename to browser/devtools/debugger/test/addon1.xpi
rename from browser/devtools/debugger/test/browser_dbg_addon2.xpi
rename to browser/devtools/debugger/test/addon2.xpi
deleted file mode 100644
--- a/browser/devtools/debugger/test/browser_dbg_function-search-01.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <!-- Any copyright is dedicated to the Public Domain.
-       http://creativecommons.org/publicdomain/zero/1.0/ -->
-  <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Function Search</title>
-    <script type="text/javascript" src="test-function-search-01.js"></script>
-    <script type="text/javascript" src="test-function-search-02.js"></script>
-    <script type="text/javascript" src="test-function-search-03.js"></script>
-  </head>
-
-  <body>
-    <p>Peanut butter jelly time!</p>
-  </body>
-
-</html>
rename from browser/devtools/debugger/test/binary_search.coffee
rename to browser/devtools/debugger/test/code_binary_search.coffee
rename from browser/devtools/debugger/test/binary_search.js
rename to browser/devtools/debugger/test/code_binary_search.js
--- a/browser/devtools/debugger/test/binary_search.js
+++ b/browser/devtools/debugger/test/code_binary_search.js
@@ -20,10 +20,10 @@
     } else {
       return -1;
     }
   };
 
 }).call(this);
 
 /*
-//# sourceMappingURL=binary_search.map
+//# sourceMappingURL=code_binary_search.map
 */
rename from browser/devtools/debugger/test/binary_search.map
rename to browser/devtools/debugger/test/code_binary_search.map
--- a/browser/devtools/debugger/test/binary_search.map
+++ b/browser/devtools/debugger/test/code_binary_search.map
@@ -1,10 +1,10 @@
 {
   "version": 3,
-  "file": "binary_search.js",
+  "file": "code_binary_search.js",
   "sourceRoot": "",
   "sources": [
-    "binary_search.coffee"
+    "code_binary_search.coffee"
   ],
   "names": [],
   "mappings": ";AACA;CAAA;CAAA,CAAA,CAAuB,EAAA,CAAjB,GAAkB,IAAxB;CAEE,OAAA,UAAA;CAAA,EAAQ,CAAR,CAAA;CAAA,EACQ,CAAR,CAAa,CAAL;CADR,EAEQ,CAAR,CAAA;CAEA,EAA0C,CAAR,CAAtB,MAAN;CAGJ,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,CAAR,CAAQ,GAAR;QAAA;CACA,EAA6B,CAAR,CAAA,CAArB;CAAA,EAAQ,EAAR,GAAA;QADA;CAAA,EAIQ,CAAI,CAAZ,CAAA;CAXF,IAIA;CAUA,GAAA,CAAS;CAAT,YAA8B;MAA9B;AAA0C,CAAD,YAAA;MAhBpB;CAAvB,EAAuB;CAAvB"
-}
\ No newline at end of file
+}
rename from browser/devtools/debugger/test/blackboxing_blackboxme.js
rename to browser/devtools/debugger/test/code_blackboxing_blackboxme.js
rename from browser/devtools/debugger/test/blackboxing_one.js
rename to browser/devtools/debugger/test/code_blackboxing_one.js
--- a/browser/devtools/debugger/test/blackboxing_one.js
+++ b/browser/devtools/debugger/test/code_blackboxing_one.js
@@ -1,1 +1,4 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
 function one() { two(); }
rename from browser/devtools/debugger/test/blackboxing_three.js
rename to browser/devtools/debugger/test/code_blackboxing_three.js
--- a/browser/devtools/debugger/test/blackboxing_three.js
+++ b/browser/devtools/debugger/test/code_blackboxing_three.js
@@ -1,1 +1,4 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
 function three() { doDebuggerStatement(); }
rename from browser/devtools/debugger/test/blackboxing_two.js
rename to browser/devtools/debugger/test/code_blackboxing_two.js
--- a/browser/devtools/debugger/test/blackboxing_two.js
+++ b/browser/devtools/debugger/test/code_blackboxing_two.js
@@ -1,1 +1,4 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
 function two() { three(); }
rename from browser/devtools/debugger/test/test-function-search-01.js
rename to browser/devtools/debugger/test/code_function-search-01.js
rename from browser/devtools/debugger/test/test-function-search-02.js
rename to browser/devtools/debugger/test/code_function-search-02.js
rename from browser/devtools/debugger/test/test-function-search-03.js
rename to browser/devtools/debugger/test/code_function-search-03.js
rename from browser/devtools/debugger/test/test-location-changes-bp.js
rename to browser/devtools/debugger/test/code_location-changes.js
rename from browser/devtools/debugger/test/math.js
rename to browser/devtools/debugger/test/code_math.js
--- a/browser/devtools/debugger/test/math.js
+++ b/browser/devtools/debugger/test/code_math.js
@@ -33,13 +33,13 @@ function arithmetic() {
     });
   });
 }
 
 // Compile with closure compiler and the following flags:
 //
 //     --compilation_level WHITESPACE_ONLY
 //     --source_map_format V3
-//     --create_source_map math.map
-//     --js_output_file    math.min.js
+//     --create_source_map code_math.map
+//     --js_output_file    code_math.min.js
 //
-// And then append the sourceMappingURL comment directive to math.min.js
+// And then append the sourceMappingURL comment directive to code_math.min.js
 // manually.
rename from browser/devtools/debugger/test/math.map
rename to browser/devtools/debugger/test/code_math.map
--- a/browser/devtools/debugger/test/math.map
+++ b/browser/devtools/debugger/test/code_math.map
@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"math.min.js",
+"file":"code_math.min.js",
 "lineCount":1,
 "mappings":"AAAAA,QAASA,IAAG,CAACC,CAAD,CAAIC,CAAJ,CAAOC,CAAP,CAAU,CACpB,IAAIC,OAASH,CAATG,CAAaF,CACjB,OAAOC,EAAA,CAAEC,MAAF,CAFa,CAKtBC,QAASA,IAAG,CAACJ,CAAD,CAAIC,CAAJ,CAAOC,CAAP,CAAU,CACpB,IAAIC,OAASH,CAATG,CAAaF,CACjB,OAAOC,EAAA,CAAEC,MAAF,CAFa,CAKtBE,QAASA,IAAG,CAACL,CAAD,CAAIC,CAAJ,CAAOC,CAAP,CAAU,CACpB,IAAIC,OAASH,CAATG,CAAaF,CACjB,OAAOC,EAAA,CAAEC,MAAF,CAFa,CAKtBG,QAASA,IAAG,CAACN,CAAD,CAAIC,CAAJ,CAAOC,CAAP,CAAU,CACpB,IAAIC,OAASH,CAATG,CAAaF,CACjB,OAAOC,EAAA,CAAEC,MAAF,CAFa,CAKtBI,QAASA,WAAU,EAAG,CACpBR,GAAA,CAAI,CAAJ,CAAO,CAAP,CAAU,QAAS,CAACC,CAAD,CAAI,CAErBI,GAAA,CAAIJ,CAAJ,CAAO,CAAP,CAAU,QAAS,CAACC,CAAD,CAAI,CAErBI,GAAA,CAAIJ,CAAJ,CAAO,CAAP,CAAU,QAAS,CAACO,CAAD,CAAI,CAErBF,GAAA,CAAIE,CAAJ,CAAO,CAAP,CAAU,QAAS,CAACC,CAAD,CAAI,CAErBC,OAAAC,IAAA,CAAYF,CAAZ,CAFqB,CAAvB,CAFqB,CAAvB,CAFqB,CAAvB,CAFqB,CAAvB,CADoB;",
-"sources":["math.js"],
+"sources":["code_math.js"],
 "names":["add","a","b","k","result","sub","mul","div","arithmetic","c","d","console","log"]
 }
rename from browser/devtools/debugger/test/math.min.js
rename to browser/devtools/debugger/test/code_math.min.js
--- a/browser/devtools/debugger/test/math.min.js
+++ b/browser/devtools/debugger/test/code_math.min.js
@@ -1,2 +1,2 @@
 function add(a,b,k){var result=a+b;return k(result)}function sub(a,b,k){var result=a-b;return k(result)}function mul(a,b,k){var result=a*b;return k(result)}function div(a,b,k){var result=a/b;return k(result)}function arithmetic(){add(4,4,function(a){sub(a,2,function(b){mul(b,3,function(c){div(c,2,function(d){console.log(d)})})})})};
-//@ sourceMappingURL=math.map
+//@ sourceMappingURL=code_math.map
rename from browser/devtools/debugger/test/test-script-switching-01.js
rename to browser/devtools/debugger/test/code_script-switching-01.js
rename from browser/devtools/debugger/test/test-script-switching-02.js
rename to browser/devtools/debugger/test/code_script-switching-02.js
--- a/browser/devtools/debugger/test/test-script-switching-02.js
+++ b/browser/devtools/debugger/test/code_script-switching-02.js
@@ -1,11 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function secondCall() {
-  // This comment is useful for browser_dbg_select-line.js. ☺
+  // This comment is useful: ☺
   eval("debugger;");
   function foo() {}
   if (true) {
     foo();
   }
 }
rename from browser/devtools/debugger/test/test-editor-mode
rename to browser/devtools/debugger/test/code_test-editor-mode
rename from browser/devtools/debugger/test/binary_search.html
rename to browser/devtools/debugger/test/doc_binary_search.html
--- a/browser/devtools/debugger/test/binary_search.html
+++ b/browser/devtools/debugger/test/doc_binary_search.html
@@ -1,12 +1,15 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Source Map Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript" src="binary_search.js"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
+
   <body>
+    <script type="text/javascript" src="code_binary_search.js"></script>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_blackboxing.html
rename to browser/devtools/debugger/test/doc_blackboxing.html
--- a/browser/devtools/debugger/test/browser_dbg_blackboxing.html
+++ b/browser/devtools/debugger/test/doc_blackboxing.html
@@ -1,23 +1,26 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Blackbox Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript" src="blackboxing_blackboxme.js"></script>
-    <script type="text/javascript" src="blackboxing_one.js"></script>
-    <script type="text/javascript" src="blackboxing_two.js"></script>
-    <script type="text/javascript" src="blackboxing_three.js"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <script type="text/javascript" src="code_blackboxing_blackboxme.js"></script>
+    <script type="text/javascript" src="code_blackboxing_one.js"></script>
+    <script type="text/javascript" src="code_blackboxing_two.js"></script>
+    <script type="text/javascript" src="code_blackboxing_three.js"></script>
     <script>
       function runTest() {
         blackboxme(doDebuggerStatement);
       }
       function doDebuggerStatement() {
         debugger;
       }
     </script>
-  </head>
-  <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_cmd_break.html
rename to browser/devtools/debugger/test/doc_cmd-break.html
--- a/browser/devtools/debugger/test/browser_dbg_cmd_break.html
+++ b/browser/devtools/debugger/test/doc_cmd-break.html
@@ -1,19 +1,22 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset="utf-8">
-    <title>Browser GCLI break command test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
     <script type="text/javascript">
       function firstCall() {
-        eval("window.line0 = Error().lineNumber; secondCall();");
+        eval("window.gLineNumber = Error().lineNumber; secondCall();");
       }
       function secondCall() {
         eval("debugger;");
       }
     </script>
-  </head>
-  <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_cmd.html
rename to browser/devtools/debugger/test/doc_cmd-dbg.html
--- a/browser/devtools/debugger/test/browser_dbg_cmd.html
+++ b/browser/devtools/debugger/test/doc_cmd-dbg.html
@@ -1,48 +1,40 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset='utf-8'/>
-  <!-- Any copyright is dedicated to the Public Domain.
-       http://creativecommons.org/publicdomain/zero/1.0/ -->
-  <script type="application/javascript;version=1.7"/>
-    let output;
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
 
-    function init() {
-      output = document.querySelector("input");
-      output.value = "";
-    }
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
 
-    function doit() {
-      debugger;
-      stepIntoMe();             // step in
+  <body>
+    <input type="text" value=""/>
+    <input type="button" value="Click me!" onclick="test()"/>
 
-      output.value = "dbg continue";
-      debugger;
-    }
+    <script type="application/javascript;version=1.7">
+      let output = document.querySelector("input");
+      output.value = "";
 
-    function stepIntoMe() {
-      output.value = "step in";   // step in
-      stepOverMe();               // step over
-      let x = 0;                  // step out
-      output.value = "step out";
-    }
+      function test() {
+        debugger;
+        stepIntoMe();               // step in
+
+        output.value = "dbg continue";
+        debugger;
+      }
 
-    function stepOverMe() {
-      output.value = "step over";
-    }
-  </script>
-</head>
-<body onload="init()">
-  <input type="text" value=""/>
-  <input type="button" value="DOIT" onclick="doit()"/>
-  <br />
-  Use this file to test the following commands:
-  <ul>
-    <li>dbg interrupt</li>
-    <li>dbg continue</li>
-    <li>dbg step over</li>
-    <li>dbg step in</li>
-    <li>dbg step out</li>
-  </ul>
-</body>
+      function stepIntoMe() {
+        output.value = "step in";   // step in
+        stepOverMe();               // step over
+        let x = 0;                  // step out
+        output.value = "step out";
+      }
+
+      function stepOverMe() {
+        output.value = "step over";
+      }
+    </script>
+  </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_conditional-breakpoints.html
rename to browser/devtools/debugger/test/doc_conditional-breakpoints.html
--- a/browser/devtools/debugger/test/browser_dbg_conditional-breakpoints.html
+++ b/browser/devtools/debugger/test/doc_conditional-breakpoints.html
@@ -1,15 +1,21 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Conditional Breakpoints Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="ermahgerd()">Click me!</button>
+
     <script type="text/javascript">
       function ermahgerd() {
         var a = {};
         debugger;
         a = "undefined";
         a = "null";
         a = "42";
         a = "true";
@@ -19,12 +25,11 @@
         a = "function() {}";
         a = "(function { return false; })()";
         a = "a";
         a = "a !== undefined";
         a = "a !== null";
         a = "b";
       }
     </script>
-  </head>
-  <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_update-editor-mode.html
rename to browser/devtools/debugger/test/doc_editor-mode.html
--- a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.html
+++ b/browser/devtools/debugger/test/doc_editor-mode.html
@@ -1,16 +1,20 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Update Editor Mode Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript" src="test-script-switching-01.js?q=a"></script>
-    <script type="text/javascript" src="test-editor-mode?a=b"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <script type="text/javascript" src="code_script-switching-01.js?a=b"></script>
+    <script type="text/javascript" src="code_test-editor-mode?c=d"></script>
     <script type="text/javascript">
-      function banana() { }
+      function banana() {
+      }
     </script>
-  </head>
-  <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_tab1.html
rename to browser/devtools/debugger/test/doc_empty-tab-01.html
--- a/browser/devtools/debugger/test/browser_dbg_tab1.html
+++ b/browser/devtools/debugger/test/doc_empty-tab-01.html
@@ -1,11 +1,14 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Test Tab</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Empty test page 1</title>
   </head>
+
   <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_tab2.html
rename to browser/devtools/debugger/test/doc_empty-tab-02.html
--- a/browser/devtools/debugger/test/browser_dbg_tab2.html
+++ b/browser/devtools/debugger/test/doc_empty-tab-02.html
@@ -1,11 +1,14 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Test Tab 2</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Empty test page 2</title>
   </head>
+
   <body>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/test-event-listeners.html
rename to browser/devtools/debugger/test/doc_event-listeners.html
--- a/browser/devtools/debugger/test/test-event-listeners.html
+++ b/browser/devtools/debugger/test/doc_event-listeners.html
@@ -1,15 +1,21 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Test for Event Listeners</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button>Click me!</button>
+    <input type="text" onchange="changeHandler()">
+
     <script type="text/javascript">
       window.addEventListener("load", function onload() {
         window.removeEventListener("load", onload);
         function initialSetup(event) {
           debugger;
           var button = document.querySelector("button");
           button.onclick = clickHandler;
         }
@@ -17,22 +23,21 @@
           window.foobar = "clickHandler";
         }
         function changeHandler(event) {
           window.foobar = "changeHandler";
         }
         function keyupHandler(event) {
           window.foobar = "keyupHandler";
         }
+
         var button = document.querySelector("button");
         button.onclick = initialSetup;
+
         var input = document.querySelector("input");
         input.addEventListener("keyup", keyupHandler, true);
+
         window.changeHandler = changeHandler;
       });
     </script>
+  </body>
 
-  </head>
-  <body>
-    <button>Click me!</button>
-    <input type="text" onchange="changeHandler()">
-  </body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_frame-parameters.html
rename to browser/devtools/debugger/test/doc_frame-parameters.html
--- a/browser/devtools/debugger/test/browser_dbg_frame-parameters.html
+++ b/browser/devtools/debugger/test/doc_frame-parameters.html
@@ -1,36 +1,37 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Function Call Parameter Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript">
-      window.addEventListener("load", function() {
-        function test(aArg, bArg, cArg, dArg, eArg, fArg) {
-          var a = 1;
-          var b = { a: a };
-          var c = { a: 1, b: "beta", c: true, d: b };
-          var myVar = {
-            _prop: 42,
-            get prop() { return this._prop; },
-            set prop(val) { this._prop = val; }
-          };
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="start()">Click me!</button>
 
-          debugger;
-        }
-        function load() {
-          var a = { a: 1, b: "beta", c: true };
-          var e = eval("test(a, 'beta', 3, false, null)");
-        }
-        var button = document.querySelector("button");
-        button.addEventListener("click", load, false);
-        var buttonAsProto = Object.create(button);
-      });
+    <script type="text/javascript">
+      function test(aArg, bArg, cArg, dArg, eArg, fArg) {
+        var a = 1;
+        var b = { a: a };
+        var c = { a: 1, b: "beta", c: 3, d: false, e: null, f: fArg };
+        var myVar = {
+          _prop: 42,
+          get prop() { return this._prop; },
+          set prop(val) { this._prop = val; }
+        };
+        debugger;
+      }
+
+      function start() {
+        var a = { a: 1, b: "beta", c: 3, d: false, e: null, f: undefined };
+        var e = eval("test(a, 'beta', 3, false, null);");
+      }
+
+      var button = document.querySelector("button");
+      var buttonAsProto = Object.create(button);
     </script>
+  </body>
 
-  </head>
-  <body>
-    <button>Click me!</button>
-  </body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_displayName.html
rename to browser/devtools/debugger/test/doc_function-display-name.html
--- a/browser/devtools/debugger/test/browser_dbg_displayName.html
+++ b/browser/devtools/debugger/test/doc_function-display-name.html
@@ -1,29 +1,31 @@
-<!DOCTYPE HTML>
-<html>
-<head><meta charset='utf-8'/><title>Browser Debugger Test Tab</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
-<script type="text/javascript">
+<!doctype html>
 
-var a = function() {
-  return function() {
-    debugger;
-  }
-}
-
-var anon = a();
-anon.displayName = "anonFunc";
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
 
-var inferred = a();
+  <body>
+    <script type="text/javascript">
+      var a = function() {
+        return function() {
+          debugger;
+        }
+      }
 
-function evalCall() {
-  eval("anon();");
-  eval("inferred();");
-}
+      var anon = a();
+      anon.displayName = "anonFunc";
+
+      var inferred = a();
 
-</script>
-</head>
-
-<body></body>
+      function evalCall() {
+        eval("anon();");
+        eval("inferred();");
+      }
+    </script>
+  </body>
 
 </html>
rename from browser/devtools/debugger/test/browser_dbg_function-search-02.html
rename to browser/devtools/debugger/test/doc_function-search.html
--- a/browser/devtools/debugger/test/browser_dbg_function-search-02.html
+++ b/browser/devtools/debugger/test/doc_function-search.html
@@ -1,29 +1,30 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
-  <!-- Any copyright is dedicated to the Public Domain.
-       http://creativecommons.org/publicdomain/zero/1.0/ -->
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Function Search</title>
-    <script type="text/javascript" src="test-function-search-01.js"></script>
-    <script type="text/javascript" src="test-function-search-02.js"></script>
-    <script type="text/javascript" src="test-function-search-03.js"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
 
   <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">
       function inline() {}
       let arrow = () => {}
 
       let foo = bar => {}
       let foo2 = bar2 = baz2 => 42;
 
       setTimeout((foo, bar, baz) => {});
       setTimeout((foo, bar, baz) => 42);
     </script>
-
   </body>
 
 </html>
rename from browser/devtools/debugger/test/browser_dbg_iframes.html
rename to browser/devtools/debugger/test/doc_iframes.html
--- a/browser/devtools/debugger/test/browser_dbg_iframes.html
+++ b/browser/devtools/debugger/test/doc_iframes.html
@@ -1,12 +1,15 @@
-<!DOCTYPE HTML>
-<html>
-<head><meta charset='utf-8'/><title>Browser Debugger IFrame Test Tab</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
-</head>
+<!doctype html>
 
-<body>
-  <iframe src="browser_dbg_debuggerstatement.html"></iframe>
-</body>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <iframe src="doc_inline-debugger-statement.html"></iframe>
+  </body>
 
 </html>
rename from browser/devtools/debugger/test/test-location-changes-bp.html
rename to browser/devtools/debugger/test/doc_included-script.html
--- a/browser/devtools/debugger/test/test-location-changes-bp.html
+++ b/browser/devtools/debugger/test/doc_included-script.html
@@ -1,17 +1,22 @@
-<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
-<head>
-<meta charset='utf-8'/>
-<script type="text/javascript" src="test-location-changes-bp.js"></script>
-<script type="text/javascript">
-function runDebuggerStatement() {
-  debugger;
-}
-</script>
-</head>
-<body>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="myFunction()">Click me!</button>
 
-<button type="button" onclick="myFunction()">Run</button>
+    <script type="text/javascript" src="code_location-changes.js"></script>
+    <script type="text/javascript">
+      function runDebuggerStatement() {
+        debugger;
+      }
+    </script>
+  </body>
 
-</body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_debuggerstatement.html
rename to browser/devtools/debugger/test/doc_inline-debugger-statement.html
--- a/browser/devtools/debugger/test/browser_dbg_debuggerstatement.html
+++ b/browser/devtools/debugger/test/doc_inline-debugger-statement.html
@@ -1,18 +1,21 @@
-<!DOCTYPE HTML>
-<html>
-<head><meta charset='utf-8'/><title>Browser Debugger Test Tab</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
-<script type="text/javascript">
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
 
-function runDebuggerStatement()
-{
-  debugger;
-}
+  <body>
+    <button>Click me!</button>
 
-</script>
-</head>
-
-<body></body>
+    <script type="text/javascript">
+      function runDebuggerStatement() {
+        debugger;
+      }
+    </script>
+  </body>
 
 </html>
rename from browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.html
rename to browser/devtools/debugger/test/doc_inline-script.html
--- a/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.html
+++ b/browser/devtools/debugger/test/doc_inline-script.html
@@ -1,20 +1,25 @@
-<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
-<head>
-<meta charset='utf-8'/>
-<script type="text/javascript">
-function runDebuggerStatement() {
-  debugger;
-}
-function myFunction() {
-  var a = 1;
-  debugger;
-}
-</script>
-</head>
-<body>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="myFunction()">Click me!</button>
 
-<button type="button" onclick="myFunction()">Run</button>
+    <script type="text/javascript">
+      function runDebuggerStatement() {
+        debugger;
+      }
+      function myFunction() {
+        var a = 1;
+        debugger;
+      }
+    </script>
+  </body>
 
-</body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_big-data.html
rename to browser/devtools/debugger/test/doc_large-array-buffer.html
--- a/browser/devtools/debugger/test/browser_dbg_big-data.html
+++ b/browser/devtools/debugger/test/doc_large-array-buffer.html
@@ -1,27 +1,22 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Big Data Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="test(10000)">Click me!</button>
+
     <script type="text/javascript">
-      window.addEventListener("load", function() {
-        function test(aNumber) {
-          var buffer = new ArrayBuffer(aNumber);
-          var z = new Int8Array(buffer);
-          debugger;
-        };
-        function load() {
-          test(10000);
-        }
-        var button = document.querySelector("button");
-        button.addEventListener("click", load, false);
-      });
+      function test(aNumber) {
+        var buffer = new ArrayBuffer(aNumber);
+        var z = new Int8Array(buffer);
+        debugger;
+      }
     </script>
-
-  </head>
-  <body>
-    <button>Click me!</button>
   </body>
 </html>
rename from browser/devtools/debugger/test/minified.html
rename to browser/devtools/debugger/test/doc_minified.html
--- a/browser/devtools/debugger/test/minified.html
+++ b/browser/devtools/debugger/test/doc_minified.html
@@ -1,6 +1,14 @@
-<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
   <body>
-    <script src="math.min.js"></script>
+    <script src="code_math.min.js"></script>
   </body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_pause-exceptions.html
rename to browser/devtools/debugger/test/doc_pause-exceptions.html
--- a/browser/devtools/debugger/test/browser_dbg_pause-exceptions.html
+++ b/browser/devtools/debugger/test/doc_pause-exceptions.html
@@ -1,30 +1,35 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Pause on Exceptions Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
+
   <body>
     <button>Click me!</button>
     <ul></ul>
+
+    <script type="text/javascript">
+      window.addEventListener("load", function() {
+        function test() {
+          try {
+            throw new Error("boom");
+          } catch (e) {
+            var list = document.querySelector("ul");
+            var item = document.createElement("li");
+            item.innerHTML = e.message;
+            list.appendChild(item);
+          } finally {
+            debugger;
+          }
+        }
+        var button = document.querySelector("button");
+        button.addEventListener("click", test, false);
+      });
+    </script>
   </body>
-  <script type="text/javascript">
-    window.addEventListener("load", function() {
-      function load() {
-        try {
-          debugger;
-          throw new Error("boom");
-        } catch (e) {
-          var list = document.querySelector("ul");
-          var item = document.createElement("li");
-          item.innerHTML = e.message;
-          list.appendChild(item);
-        }
-      }
-      var button = document.querySelector("button");
-      button.addEventListener("click", load, false);
-    });
-  </script>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_stack.html
rename to browser/devtools/debugger/test/doc_recursion-stack.html
--- a/browser/devtools/debugger/test/browser_dbg_stack.html
+++ b/browser/devtools/debugger/test/doc_recursion-stack.html
@@ -1,32 +1,35 @@
-<!DOCTYPE HTML>
-<html>
-<head><meta charset='utf-8'/><title>Browser Debugger Test Tab</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
-<script type="text/javascript">
+<!doctype html>
 
-function simpleCall() {
-  debugger;
-}
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
 
-function evalCall() {
-  eval("debugger;");
-}
+  <body>
+    <script type="text/javascript">
+      function simpleCall() {
+        debugger;
+      }
 
-var gRecurseLimit = 100;
-var gRecurseDepth = 0;
-function recurse() {
-  if (++gRecurseDepth == gRecurseLimit) {
-    debugger;
-    gRecurseDepth = 0;
-    return;
-  }
-  recurse();
-}
+      function evalCall() {
+        eval("debugger;");
+      }
+
+      var gRecurseLimit = 100;
+      var gRecurseDepth = 0;
 
-</script>
-</head>
-
-<body></body>
+      function recurse() {
+        if (++gRecurseDepth == gRecurseLimit) {
+          debugger;
+          gRecurseDepth = 0;
+          return;
+        }
+        recurse();
+      }
+    </script>
+  </body>
 
 </html>
rename from browser/devtools/debugger/test/browser_dbg_script-switching.html
rename to browser/devtools/debugger/test/doc_script-switching-01.html
--- a/browser/devtools/debugger/test/browser_dbg_script-switching.html
+++ b/browser/devtools/debugger/test/doc_script-switching-01.html
@@ -1,14 +1,18 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Script Switching Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript" src="test-script-switching-01.js"></script>
-    <script type="text/javascript" src="test-script-switching-02.js"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
+
   <body>
     <button onclick="firstCall()">Click me!</button>
+
+    <script type="text/javascript" src="code_script-switching-01.js"></script>
+    <script type="text/javascript" src="code_script-switching-02.js"></script>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_script-switching-02.html
rename to browser/devtools/debugger/test/doc_script-switching-02.html
--- a/browser/devtools/debugger/test/browser_dbg_script-switching-02.html
+++ b/browser/devtools/debugger/test/doc_script-switching-02.html
@@ -1,13 +1,18 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Script Switching Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-    <script type="text/javascript" src="test-script-switching-01.js"></script>
-    <script type="text/javascript" src="test-script-switching-02.js?foo=bar,baz|lol"></script>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
+
   <body>
+    <button onclick="firstCall()">Click me!</button>
+
+    <script type="text/javascript" src="code_script-switching-01.js"></script>
+    <script type="text/javascript" src="code_script-switching-02.js?foo=bar,baz|lol"></script>
   </body>
+
 </html>
rename from browser/devtools/debugger/test/test-step-out.html
rename to browser/devtools/debugger/test/doc_step-out.html
--- a/browser/devtools/debugger/test/test-step-out.html
+++ b/browser/devtools/debugger/test/doc_step-out.html
@@ -1,37 +1,42 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Step Out Return Value Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
   </head>
+
   <body>
-    <button id="return">return</button>
-    <button id="throw">throw</button>
-  </body>
-  <script type="text/javascript">
-    window.addEventListener("load", function() {
+    <button id="return">Return me!</button>
+    <button id="throw">Throw me!</button>
+
+    <script type="text/javascript">
       function normal(aArg) {
         debugger;
         var r = 10;
         return r;
       }
+
       function error(aArg) {
         function inner(aArg) {
           debugger;
           var r = 10;
           throw "boom";
           return r;
         }
         try {
           inner(aArg);
         } catch (e) {}
       }
-      var button = document.getElementById("return");
-      button.addEventListener("click", normal, false);
-      button = document.getElementById("throw");
-      button.addEventListener("click", error, false);
-    });
-  </script>
+
+      var normalBtn = document.getElementById("return");
+      normalBtn.addEventListener("click", normal, false);
+
+      var throwBtn = document.getElementById("throw");
+      throwBtn.addEventListener("click", error, false);
+    </script>
+  </body>
+
 </html>
rename from browser/devtools/debugger/test/browser_dbg_watch-expressions.html
rename to browser/devtools/debugger/test/doc_watch-expressions.html
--- a/browser/devtools/debugger/test/browser_dbg_watch-expressions.html
+++ b/browser/devtools/debugger/test/doc_watch-expressions.html
@@ -1,27 +1,29 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Browser Debugger Watch Expressions Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
     <script type="text/javascript">
       function test() {
         ermahgerd.call({ canada: new String("eh") });
       }
       function ermahgerd(aArg) {
         var t = document.title;
         debugger;
         (function() {
           var a = undefined;
           debugger;
           var a = {};
           debugger;
         }("sensational"));
       }
     </script>
+  </body>
 
-  </head>
-  <body>
-  </body>
 </html>
rename from browser/devtools/debugger/test/browser_dbg_with-frame.html
rename to browser/devtools/debugger/test/doc_with-frame.html
--- a/browser/devtools/debugger/test/browser_dbg_with-frame.html
+++ b/browser/devtools/debugger/test/doc_with-frame.html
@@ -1,33 +1,29 @@
-<!DOCTYPE HTML>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
 <html>
   <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Function Call Parameter Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <button onclick="test(10)">Click me!</button>
+
     <script type="text/javascript">
-      window.addEventListener("load", function() {
-        function test(aNumber) {
-          var a, obj = { one: 1, two: 2 };
-          var r = aNumber;
-          with (Math) {
-            a = PI * r * r;
-            with (obj) {
-              var foo = two * PI;
-              debugger;
-            }
+      function test(aNumber) {
+        var a, obj = { one: 1, two: 2 };
+        var r = aNumber;
+        with (Math) {
+          a = PI * r * r;
+          with (obj) {
+            var foo = two * PI;
+            debugger;
           }
-        };
-        function load() {
-          test(10);
         }
-        var button = document.querySelector("button");
-        button.addEventListener("click", load, false);
-      });
+      }
     </script>
+  </body>
 
-  </head>
-  <body>
-    <button>Click me!</button>
-  </body>
 </html>
deleted file mode 100644
--- a/browser/devtools/debugger/test/test-pause-exceptions-reload.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta charset='utf-8'/>
-    <title>Debugger Pause on Exceptions After Reload Test</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-  </head>
-  <body>
-    <ul></ul>
-  </body>
-  <script type="text/javascript">
-    window.addEventListener("load", function() {
-      function load() {
-        try {
-          throw new Error("boom");
-        } catch (e) {
-          var list = document.querySelector("ul");
-          var item = document.createElement("li");
-          item.innerHTML = e.message;
-          list.appendChild(item);
-        }
-      }
-      load();
-    });
-  </script>
-</html>
--- a/browser/devtools/debugger/test/testactors.js
+++ b/browser/devtools/debugger/test/testactors.js
@@ -3,17 +3,17 @@
 
 function TestActor1(aConnection, aTab)
 {
   this.conn = aConnection;
   this.tab = aTab;
 }
 
 TestActor1.prototype = {
-  actorPrefix: "testone",
+  actorPrefix: "test_one",
 
   grip: function TA1_grip() {
     return { actor: this.actorID,
              test: "TestActor1" };
   },
 
   onPing: function TA1_onPing() {
     return { pong: "pong" };