Bug 1170441 - Cleanup password manager mochitest titles/encodings/doctypes. r=test-only
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Tue, 02 Jun 2015 00:20:07 -0700
changeset 277419 db74910400e6617fcd89f86e2c7e90598c65a2fe
parent 277418 dc06bd6305ca50d0d49b814c53b8e04aa984a4ad
child 277420 686032b3566e5e6384eccad87fbe0c6c7ece16e5
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1170441
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1170441 - Cleanup password manager mochitest titles/encodings/doctypes. r=test-only
toolkit/components/passwordmgr/test/mochitest.ini
toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html
toolkit/components/passwordmgr/test/subtst_notifications_1.html
toolkit/components/passwordmgr/test/subtst_notifications_10.html
toolkit/components/passwordmgr/test/subtst_notifications_11.html
toolkit/components/passwordmgr/test/subtst_notifications_11_popup.html
toolkit/components/passwordmgr/test/subtst_notifications_2.html
toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html
toolkit/components/passwordmgr/test/subtst_notifications_3.html
toolkit/components/passwordmgr/test/subtst_notifications_4.html
toolkit/components/passwordmgr/test/subtst_notifications_5.html
toolkit/components/passwordmgr/test/subtst_notifications_6.html
toolkit/components/passwordmgr/test/subtst_notifications_7.html
toolkit/components/passwordmgr/test/subtst_notifications_8.html
toolkit/components/passwordmgr/test/subtst_notifications_9.html
toolkit/components/passwordmgr/test/subtst_privbrowsing_1.html
toolkit/components/passwordmgr/test/subtst_privbrowsing_2.html
toolkit/components/passwordmgr/test/subtst_privbrowsing_3.html
toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
toolkit/components/passwordmgr/test/subtst_prompt_async.html
toolkit/components/passwordmgr/test/test_autofill_before_load.html
toolkit/components/passwordmgr/test/test_autofill_password-only.html
toolkit/components/passwordmgr/test/test_basic_form.html
toolkit/components/passwordmgr/test/test_basic_form_0pw.html
toolkit/components/passwordmgr/test/test_basic_form_1pw.html
toolkit/components/passwordmgr/test/test_basic_form_1pw_2.html
toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
toolkit/components/passwordmgr/test/test_basic_form_2pw_2.html
toolkit/components/passwordmgr/test/test_basic_form_3pw_1.html
toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
toolkit/components/passwordmgr/test/test_basic_form_html5.html
toolkit/components/passwordmgr/test/test_basic_form_pwonly.html
toolkit/components/passwordmgr/test/test_bug_221634.html
toolkit/components/passwordmgr/test/test_bug_242956.html
toolkit/components/passwordmgr/test/test_bug_360493_1.html
toolkit/components/passwordmgr/test/test_bug_360493_2.html
toolkit/components/passwordmgr/test/test_bug_391514.html
toolkit/components/passwordmgr/test/test_bug_427033.html
toolkit/components/passwordmgr/test/test_bug_444968.html
toolkit/components/passwordmgr/test/test_bug_627616.html
toolkit/components/passwordmgr/test/test_bug_654348.html
toolkit/components/passwordmgr/test/test_bug_776171.html
toolkit/components/passwordmgr/test/test_case_differences.html
toolkit/components/passwordmgr/test/test_form_action_1.html
toolkit/components/passwordmgr/test/test_form_action_2.html
toolkit/components/passwordmgr/test/test_form_action_javascript.html
toolkit/components/passwordmgr/test/test_input_events.html
toolkit/components/passwordmgr/test/test_input_events_for_identical_values.html
toolkit/components/passwordmgr/test/test_master_password.html
toolkit/components/passwordmgr/test/test_master_password_cleanup.html
toolkit/components/passwordmgr/test/test_maxlength.html
toolkit/components/passwordmgr/test/test_passwords_in_type_password.html
toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html
toolkit/components/passwordmgr/test/test_prompt.html
toolkit/components/passwordmgr/test/test_prompt_async.html
toolkit/components/passwordmgr/test/test_recipe_login_fields.html
toolkit/components/passwordmgr/test/test_xhr.html
toolkit/components/passwordmgr/test/test_xhr_2.html
toolkit/components/passwordmgr/test/test_xml_load.html
toolkit/components/passwordmgr/test/test_zzz_finish.html
--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -24,57 +24,57 @@ support-files =
   subtst_notifications_9.html
   subtst_privbrowsing_1.html
   subtst_privbrowsing_2.html
   subtst_privbrowsing_3.html
   subtst_privbrowsing_4.html
   subtst_prompt_async.html
   auth2/authenticate.sjs
 
+[test_autofill_before_load.html]
+# This test doesn't pass because we can't ensure a cross-platform event that
+# occurs between DOMContentLoaded and Pageload
+skip-if = true
+[test_autofill_password-only.html]
 [test_basic_form.html]
 [test_basic_form_0pw.html]
 [test_basic_form_1pw.html]
 [test_basic_form_1pw_2.html]
 [test_basic_form_2pw_1.html]
 [test_basic_form_2pw_2.html]
 [test_basic_form_3pw_1.html]
 [test_basic_form_autocomplete.html]
 skip-if = toolkit == 'android'
 [test_case_differences.html]
 skip-if = toolkit == 'android'
 [test_basic_form_html5.html]
 [test_basic_form_pwevent.html]
 [test_basic_form_pwonly.html]
-[test_bug_221634.html]
-# This test doesn't pass because we can't ensure a cross-platform event that
-# occurs between DOMContentLoaded and Pageload
-skip-if = true
-[test_bug_242956.html]
-[test_bug_360493_1.html]
-[test_bug_360493_2.html]
-[test_bug_391514.html]
-[test_bug_427033.html]
-[test_bug_444968.html]
 [test_bug_627616.html]
 skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug_654348.html]
 [test_bug_776171.html]
+[test_form_action_1.html]
+[test_form_action_2.html]
+[test_form_action_javascript.html]
 [test_input_events.html]
 [test_input_events_for_identical_values.html]
 [test_master_password.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_master_password_cleanup.html]
 skip-if = toolkit == 'android'
+[test_maxlength.html]
 [test_notifications.html]
 skip-if = toolkit == 'android'
 [test_notifications_popup.html]
 skip-if = os == "linux" || toolkit == 'android' # bug 934057
+[test_passwords_in_type_password.html]
 [test_prompt.html]
 skip-if = os == "linux" || toolkit == 'android' #TIMED_OUT
 [test_prompt_async.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_recipe_login_fields.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_xhr.html]
 skip-if = toolkit == 'android' #TIMED_OUT
+[test_xhr_2.html]
 [test_xml_load.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_zzz_finish.html]
--- a/toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html
+++ b/toolkit/components/passwordmgr/test/privbrowsing_perwindowpb_iframe.html
@@ -1,8 +1,9 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
 </head>
 <body>
 <iframe id="iframe"></iframe>
 </body>
 </html>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_1.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_1.html
@@ -1,11 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <title>Subtest for Login Manager notifications</title>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications - Basic 1un 1pw</title>
 </head>
 <body>
 <h2>Subtest 1</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
 </form>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_10.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_10.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 10</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
 </form>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_11.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_11.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Subtest for Login Manager notifications</title>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications - Popup Windows</title>
 </head>
 <body>
 <h2>Subtest 11 (popup windows)</h2>
 <script>
 
 // Ignore the '?' and split on |
 [username, password, features, autoClose] = window.location.search.substring(1).split('|');
 
--- a/toolkit/components/passwordmgr/test/subtst_notifications_11_popup.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_11_popup.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 11</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_2.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_2.html
@@ -1,11 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <title>Subtest for Login Manager notifications</title>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications - autocomplete=off on the username field</title>
 </head>
 <body>
 <h2>Subtest 2</h2>
 (username autocomplete=off)
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user" autocomplete="off">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_2pw_0un.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications with 2 password fields and no username</title>
 </head>
 <body>
 <h2>Subtest 24</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="pass1" name="pass1" type="password" value="staticpw">
   <input id="pass" name="pass" type="password">
   <button type="submit">Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_3.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_3.html
@@ -1,11 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <title>Subtest for Login Manager notifications</title>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications - autocomplete=off on the password field</title>
 </head>
 <body>
 <h2>Subtest 3</h2>
 (password autocomplete=off)
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password" autocomplete="off">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_4.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_4.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8" >
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 4</h2>
 (form autocomplete=off)
 <form id="form" action="formsubmit.sjs" autocomplete="off">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
--- a/toolkit/components/passwordmgr/test/subtst_notifications_5.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_5.html
@@ -1,11 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <title>Subtest for Login Manager notifications</title>
+  <meta charset="utf-8">
+  <title>Subtest for Login Manager notifications - Form with only a username field</title>
 </head>
 <body>
 <h2>Subtest 5</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <button type='submit'>Submit</button>
 </form>
 
--- a/toolkit/components/passwordmgr/test/subtst_notifications_6.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_6.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 6</h2>
 (password-only form)
 <form id="form" action="formsubmit.sjs">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_7.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_7.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 7</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_8.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_8.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 8</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_notifications_9.html
+++ b/toolkit/components/passwordmgr/test/subtst_notifications_9.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications</title>
 </head>
 <body>
 <h2>Subtest 9</h2>
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
--- a/toolkit/components/passwordmgr/test/subtst_privbrowsing_1.html
+++ b/toolkit/components/passwordmgr/test/subtst_privbrowsing_1.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications (private browsing)</title>
 </head>
 <body>
 <h2>Subtest 1</h2>
 <!--
   Make sure that the password-save notification appears outside of
   the private mode, but not inside it.
 -->
--- a/toolkit/components/passwordmgr/test/subtst_privbrowsing_2.html
+++ b/toolkit/components/passwordmgr/test/subtst_privbrowsing_2.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications (private browsing)</title>
 </head>
 <body>
 <h2>Subtest 2</h2>
 <!--
   Make sure that the password-change notification appears outside of
   the private mode, but not inside it.
 -->
--- a/toolkit/components/passwordmgr/test/subtst_privbrowsing_3.html
+++ b/toolkit/components/passwordmgr/test/subtst_privbrowsing_3.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications (private browsing)</title>
 </head>
 <body>
 <h2>Subtest 3</h2>
 <!--
   Make sure that the user/pass fields are auto-filled outside of
   the private mode, but not inside it.
 -->
--- a/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
+++ b/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Subtest for Login Manager notifications (private browsing)</title>
   <script type="text/javascript" src="pwmgr_common.js"></script>
 </head>
 <body>
 <h2>Subtest 4</h2>
 <!--
   Make sure that the user/pass fields have manual filling enabled
   in private mode.
--- a/toolkit/components/passwordmgr/test/subtst_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/subtst_prompt_async.html
@@ -1,11 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Multiple auth request</title>
 </head>
 <body>
   <iframe id="iframe1" src="http://example.com/tests/toolkit/components/passwordmgr/test/authenticate.sjs?r=1&user=user3name&pass=user3pass&realm=mochirealm3&proxy_user=proxy_user2&proxy_pass=proxy_pass2&proxy_realm=proxy_realm2"></iframe>
   <iframe id="iframe2" src="http://example.com/tests/toolkit/components/passwordmgr/test/authenticate.sjs?r=2&user=user3name&pass=user3pass&realm=mochirealm3&proxy_user=proxy_user2&proxy_pass=proxy_pass2&proxy_realm=proxy_realm2"></iframe>
   <iframe id="iframe3" src="http://example.com/tests/toolkit/components/passwordmgr/test/authenticate.sjs?r=3&user=user3name&pass=user3pass&realm=mochirealm3&proxy_user=proxy_user2&proxy_pass=proxy_pass2&proxy_realm=proxy_realm2"></iframe>
 </body>
 </html>
rename from toolkit/components/passwordmgr/test/test_bug_221634.html
rename to toolkit/components/passwordmgr/test/test_autofill_before_load.html
--- a/toolkit/components/passwordmgr/test/test_bug_221634.html
+++ b/toolkit/components/passwordmgr/test/test_autofill_before_load.html
@@ -1,30 +1,31 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
+  <meta charset="utf-8">
+  <title>Test for filling before the load event</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
-  <script type="text/javascript" src="pwmgr_common.js"></script>  
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="endTest();">
-Login Manager test: 221634
+Login Manager test: Bug 221634
 <p id="display"></p>
 <div id="content" style="display: none">
 
   <form id="form1" action="formtest.js">
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset</button>
   </form>
-  
+
   <img onload="performTest();" src="mlogosm.gif">
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: 221634 (password manager needs to fill in forms before the page finishes loading) **/
 commonInit();
 
@@ -67,17 +68,17 @@ function performTest() {
 
   testHappened = true;
 }
 
 // Step 3 - Fired by |body| onload.
 function endTest() {
   ok(dclHappened, "Sanity check to make sure DOMContentLoaded already happened");
   ok(testHappened, "Sanity check to make sure our test ran before pageload");
-  
+
   // Check form1
   is($_(1, "uname").value, "testuser", "Rechecking filled username");
   is($_(1, "pword").value, "testpass", "Rechecking filled password");
 
   pageloadHappened = true;
 
   // Make sure the expected number of tests (for this page) have run.
   // If the event execution gets out of order, only a subset get counted.
rename from toolkit/components/passwordmgr/test/test_bug_444968.html
rename to toolkit/components/passwordmgr/test/test_autofill_password-only.html
--- a/toolkit/components/passwordmgr/test/test_bug_444968.html
+++ b/toolkit/components/passwordmgr/test/test_autofill_password-only.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test password-only forms should prefer a password-only login when present</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: 444968
+Login Manager test: Bug 444968
 <script>
 commonInit();
 SimpleTest.waitForExplicitFinish();
 
 const Ci = SpecialPowers.Ci;
 const Cc = SpecialPowers.Cc;
 pwmgr = Cc["@mozilla.org/login-manager;1"].
         getService(Ci.nsILoginManager);
--- a/toolkit/components/passwordmgr/test/test_basic_form.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test basic autofill</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: simple form fill
 
 <script>
 commonInit();
--- a/toolkit/components/passwordmgr/test/test_basic_form_0pw.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_0pw.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test forms with no password fields</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms with no password fields
 <p id="display"></p>
 
 <div id="content" style="display: none">
--- a/toolkit/components/passwordmgr/test/test_basic_form_1pw.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_1pw.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
+  <meta charset="utf-8">
+  <title>Test autofill for forms with 1 password field</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms with 1 password field
 <p id="display"></p>
 
--- a/toolkit/components/passwordmgr/test/test_basic_form_1pw_2.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_1pw_2.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test forms with 1 password field, part 2</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms with 1 password field, part 2
 <p id="display"></p>
 
 <div id="content" style="display: none">
--- a/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_2pw_1.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
+  <meta charset="utf-8">
+  <title>Test autofill for forms with 2 password fields</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms with 2 password fields
 
 <p id="display"></p>
@@ -184,9 +185,8 @@ function startTest() {
 
 window.addEventListener("runTests", startTest);
 
 SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
-
--- a/toolkit/components/passwordmgr/test/test_basic_form_2pw_2.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_2pw_2.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test for form fill with 2 password fields</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: (placeholder)
+Login Manager test: form fill, 2 password fields
 <p id="display"></p>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: form fill, 2 password fields **/
 
 /*
--- a/toolkit/components/passwordmgr/test/test_basic_form_3pw_1.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_3pw_1.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test autofill for forms with 3 password fields</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms with 3 password fields (form filling)
 <p id="display"></p>
 
 <div id="content" style="display: none">
--- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test basic autocomplete</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: multiple login autocomplete
 
 <script>
@@ -581,17 +582,17 @@ function* runTest() {
   restoreForm(); // clear field, so reloading test doesn't fail
   yield runNextTest();
 
   /* test 102 */
   // Turn our attention to form3
   uname = $_(3, "uname");
   pword = $_(3, "pword");
   checkACForm("singleuser5", "singlepass5");
-  
+
   // Trigger autocomplete popup
   restoreForm();
   doKey("down");
   yield runNextTest("expect popup");
 
   /* test 103 */
   // Check first entry
   doKey("down");
--- a/toolkit/components/passwordmgr/test/test_basic_form_html5.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_html5.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test for html5 input types (email, tel, url, etc.)</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: html5 input types (email, tel, url, etc.)
 <script>
 commonInit();
 SimpleTest.waitForExplicitFinish();
@@ -44,85 +45,84 @@ pwmgr.addLogin(login4);
 <p id="display"></p>
 <div id="content" style="display: none">
 
   <form id="form1" action="http://bug600551-1">
     <input  type="email"    name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form2" action="http://bug600551-2">
     <input  type="tel"      name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form3" action="http://bug600551-3">
     <input  type="url"      name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
-  
+
   <form id="form4" action="http://bug600551-4">
     <input  type="number"   name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <!-- The following forms should not be filled with usernames -->
   <form id="form5" action="formtest.js">
     <input  type="search"   name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form6" action="formtest.js">
     <input  type="datetime" name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form7" action="formtest.js">
     <input  type="date"     name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form8" action="formtest.js">
     <input  type="month" name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form9" action="formtest.js">
     <input  type="week"     name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form10" action="formtest.js">
     <input  type="time"     name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form11" action="formtest.js">
     <input  type="datetime-local" name="uname">
     <input  type="password"       name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form12" action="formtest.js">
     <input  type="range"    name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
-  
+
   <form id="form13" action="formtest.js">
     <input  type="color"    name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
 
 
 </div>
@@ -132,40 +132,40 @@ pwmgr.addLogin(login4);
 /* Test for Login Manager: 600551
   (Password manager not working with input type=email)
  */
 function startTest() {
   checkForm(1, "testuser@example.com", "testpass1");
   checkForm(2, "555-555-5555", "testpass2");
   checkForm(3, "http://mozilla.org", "testpass3");
   checkForm(4, "123456789", "testpass4");
-  
+
   is($_(5, "uname").value, "", "type=search should not be considered a username");
-  
+
   is($_(6, "uname").value, "", "type=datetime should not be considered a username");
-  
+
   is($_(7, "uname").value, "", "type=date should not be considered a username");
-  
+
   is($_(8, "uname").value, "", "type=month should not be considered a username");
-  
+
   is($_(9, "uname").value, "", "type=week should not be considered a username");
-  
+
   is($_(10, "uname").value, "", "type=time should not be considered a username");
-  
+
   is($_(11, "uname").value, "", "type=datetime-local should not be considered a username");
-  
+
   is($_(12, "uname").value, "50", "type=range should not be considered a username");
-  
+
   is($_(13, "uname").value, "#000000", "type=color should not be considered a username");
 
   pwmgr.removeLogin(login1);
   pwmgr.removeLogin(login2);
   pwmgr.removeLogin(login3);
   pwmgr.removeLogin(login4);
- 
+
   SimpleTest.finish();
 }
 
 window.addEventListener("runTests", startTest);
 </script>
 </pre>
 </body>
 </html>
--- a/toolkit/components/passwordmgr/test/test_basic_form_pwonly.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_pwonly.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test forms and logins without a username</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms and logins without a username.
 <script>
 commonInit();
 SimpleTest.waitForExplicitFinish();
--- a/toolkit/components/passwordmgr/test/test_bug_627616.html
+++ b/toolkit/components/passwordmgr/test/test_bug_627616.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test bug 627616</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <meta charset="utf-8">
+  <title>Test bug 627616 related to proxy authentication</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <script class="testbody" type="text/javascript">
     SimpleTest.waitForExplicitFinish();
 
     var Cc = SpecialPowers.Cc;
--- a/toolkit/components/passwordmgr/test/test_bug_776171.html
+++ b/toolkit/components/passwordmgr/test/test_bug_776171.html
@@ -1,15 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=776171
 -->
 <head>
-  <title>Test for Bug 776171</title>
+  <meta charset="utf-8">
+  <title>Test for Bug 776171 related to HTTP auth</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="startTest()">
 <script class="testbody" type="text/javascript">
 
 /**
  * This test checks we correctly ignore authentication entry
--- a/toolkit/components/passwordmgr/test/test_case_differences.html
+++ b/toolkit/components/passwordmgr/test/test_case_differences.html
@@ -1,19 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test autocomplete due to multiple matching logins</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: multiple login autocomplete
+Login Manager test: autocomplete due to multiple matching logins
 
 <script>
 commonInit();
 SimpleTest.waitForExplicitFinish();
 
 // Get the pwmgr service
 var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
                          .getService(SpecialPowers.Ci.nsILoginManager);
rename from toolkit/components/passwordmgr/test/test_bug_360493_1.html
rename to toolkit/components/passwordmgr/test/test_form_action_1.html
--- a/toolkit/components/passwordmgr/test/test_bug_360493_1.html
+++ b/toolkit/components/passwordmgr/test/test_form_action_1.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test for considering form action</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: 360493
+Login Manager test: Bug 360493
 <p id="display"></p>
 <div id="content" style="display: none">
 
   <!-- normal form with normal relative action. -->
   <form id="form1" action="formtest.js">
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
rename from toolkit/components/passwordmgr/test/test_bug_360493_2.html
rename to toolkit/components/passwordmgr/test/test_form_action_2.html
--- a/toolkit/components/passwordmgr/test/test_bug_360493_2.html
+++ b/toolkit/components/passwordmgr/test/test_form_action_2.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset"utf-8">
+  <title>Test for considering form action</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: 360493
+Login Manager test: Bug 360493
 <p id="display"></p>
 <div id="content" style="display: none">
 
   <!-- The tests in this page exercise things that shouldn't work. -->
 
   <!-- Change port # of action URL from 8888 to 7777 -->
   <form id="form1" action="http://localhost:7777/tests/toolkit/components/passwordmgr/test/formtest.js">
     <input  type="text"       name="uname">
rename from toolkit/components/passwordmgr/test/test_bug_427033.html
rename to toolkit/components/passwordmgr/test/test_form_action_javascript.html
--- a/toolkit/components/passwordmgr/test/test_bug_427033.html
+++ b/toolkit/components/passwordmgr/test/test_form_action_javascript.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test forms with a JS submit action</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: form with JS submit action
 <script>
 SimpleTest.waitForExplicitFinish();
 
--- a/toolkit/components/passwordmgr/test/test_input_events.html
+++ b/toolkit/components/passwordmgr/test/test_input_events.html
@@ -1,11 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Test for input events in Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="onNewEvent(event)">
 Login Manager test: input events should fire.
 
--- a/toolkit/components/passwordmgr/test/test_input_events_for_identical_values.html
+++ b/toolkit/components/passwordmgr/test/test_input_events_for_identical_values.html
@@ -1,11 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Test for input events in Login Manager when username/password are filled in already</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="onNewEvent(event)">
 Login Manager test: input events should fire.
--- a/toolkit/components/passwordmgr/test/test_master_password.html
+++ b/toolkit/components/passwordmgr/test/test_master_password.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
+  <meta charset="utf-8">
+  <title>Test for master password</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: master password.
 <script>
--- a/toolkit/components/passwordmgr/test/test_master_password_cleanup.html
+++ b/toolkit/components/passwordmgr/test/test_master_password_cleanup.html
@@ -1,12 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
+  <meta charset="utf-8">
+  <title>Test master password cleanup</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: master password cleanup
 <p id="display"></p>
 
rename from toolkit/components/passwordmgr/test/test_bug_391514.html
rename to toolkit/components/passwordmgr/test/test_maxlength.html
--- a/toolkit/components/passwordmgr/test/test_bug_391514.html
+++ b/toolkit/components/passwordmgr/test/test_maxlength.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test for maxlength attributes</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: 391514
+Login Manager test: Bug 391514
 <p id="display"></p>
 <div id="content" style="display: none">
   <!-- normal form. -->
   <form id="form1" action="formtest.js">
     <input  type="text"     name="uname">
     <input  type="password" name="pword">
 
     <button type="submit">Submit</button>
rename from toolkit/components/passwordmgr/test/test_bug_242956.html
rename to toolkit/components/passwordmgr/test/test_passwords_in_type_password.html
--- a/toolkit/components/passwordmgr/test/test_bug_242956.html
+++ b/toolkit/components/passwordmgr/test/test_passwords_in_type_password.html
@@ -1,18 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test that passwords only get filled in type=password</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
-Login Manager test: 242956
+Login Manager test: Bug 242956
 <p id="display"></p>
 <div id="content" style="display: none">
   <!-- pword is not a type=password input -->
   <form id="form1" action="formtest.js">
     <input  type="text" name="uname">
     <input  type="text" name="pword">
 
     <button type="submit">Submit</button>
--- a/toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html
+++ b/toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html
@@ -1,15 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=248970
 -->
 <head>
-  <title>Test for Bug 248970</title>
+  <meta charset="utf-8">
+  <title>Test for Private Browsing</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="notification_common.js"></script>
   <link rel="stylesheet" type="text/css"
         href="chrome://mochikit/content/tests/SimpleTest/test.css">
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=248970">Mozilla Bug 248970</a>
--- a/toolkit/components/passwordmgr/test/test_prompt.html
+++ b/toolkit/components/passwordmgr/test/test_prompt.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test username/password prompts</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <script type="text/javascript" src="notification_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: username/password prompts
 <p id="display"></p>
--- a/toolkit/components/passwordmgr/test/test_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/test_prompt_async.html
@@ -1,11 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+    <meta charset="utf-8">
     <title>Test for Async Auth Prompt</title>
     <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
     <script type="text/javascript" src="prompt_common.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
     <script class="testbody" type="text/javascript">
         SimpleTest.waitForExplicitFinish();
@@ -421,17 +422,17 @@
             var iframe1Doc = SpecialPowers.wrap(iframe1).contentDocument;
             var iframe2aDoc = SpecialPowers.wrap(iframe2a).contentDocument;
             var iframe2bDoc = SpecialPowers.wrap(iframe2b).contentDocument;
             switch (testNum)
             {
                 case 1:
                     ok(true, "doCheck testNum 1");
                     is(monitor.windowsRegistered, 3, "Registered 3 open dialogs");
-                    
+
                     var authok1 = iframe1Doc.getElementById("ok").textContent;
                     var proxyok1 = iframe1Doc.getElementById("proxy").textContent;
 
                     var authok2a = iframe2aDoc.getElementById("ok").textContent;
                     var proxyok2a = iframe2aDoc.getElementById("proxy").textContent;
 
                     var authok2b = iframe2bDoc.getElementById("ok").textContent;
                     var proxyok2b = iframe2bDoc.getElementById("proxy").textContent;
@@ -445,17 +446,17 @@
                     break;
 
                 case 2:
                     is(monitor.windowsRegistered, 2, "Registered 2 open dialogs");
                     ok(true, "doCheck testNum 2");
 
                     function checkIframe(frame) {
                         var doc = SpecialPowers.wrap(frame).contentDocument;
-                        
+
                         var authok = doc.getElementById("ok").textContent;
                         var proxyok = doc.getElementById("proxy").textContent;
 
                         is(authok, "PASS", "WWW Authorization OK, " + frame.id);
                         is(proxyok, "PASS", "Proxy Authorization OK, " + frame.id);
                     }
 
                     checkIframe(iframe1Doc.getElementById("iframe1"));
--- a/toolkit/components/passwordmgr/test/test_recipe_login_fields.html
+++ b/toolkit/components/passwordmgr/test/test_recipe_login_fields.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Test for recipes overriding login fields</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <script type="application/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
--- a/toolkit/components/passwordmgr/test/test_xhr.html
+++ b/toolkit/components/passwordmgr/test/test_xhr.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test for XHR prompts</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: XHR prompt
 <p id="display"></p>
 
@@ -140,27 +141,27 @@ function xhrLoad(xmlDoc) {
 
         newWin.close();
         break;
 
     default:
         ok(false, "Uhh, unhandled switch for testNum #" + testNum);
         break;
   }
-  
+
   doTest();
 }
 
 function doTest() {
   switch(++testNum) {
     case 1:
         startCallbackTimer();
         makeRequest("authenticate.sjs?user=xhruser1&pass=xhrpass1&realm=xhr");
         break;
-        
+
     case 2:
         // Test correct parenting, by opening another tab in the foreground,
         // and making sure the prompt re-focuses the original tab when shown:
         newWin = window.open();
         newWin.focus();
         startCallbackTimer();
         makeRequest("authenticate.sjs?user=xhruser2&pass=xhrpass2&realm=xhr2");
         break;
rename from toolkit/components/passwordmgr/test/test_bug_654348.html
rename to toolkit/components/passwordmgr/test/test_xhr_2.html
--- a/toolkit/components/passwordmgr/test/test_bug_654348.html
+++ b/toolkit/components/passwordmgr/test/test_xhr_2.html
@@ -1,15 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=654348
 -->
 <head>
-  <title>Test for Bug 654348</title>
+  <meta charset="utf-8">
+  <title>Test XHR auth with user and pass arguments</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="startTest()">
 <script class="testbody" type="text/javascript">
 
 /**
  * This test checks we correctly ignore authentication entry
--- a/toolkit/components/passwordmgr/test/test_xml_load.html
+++ b/toolkit/components/passwordmgr/test/test_xml_load.html
@@ -1,13 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Test for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
+  <meta charset="utf-8">
+  <title>Test XML document prompts</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: XML prompt
 <p id="display"></p>
 
@@ -138,17 +139,17 @@ function xmlLoad(responseDoc) {
 
         newWin.close();
         break;
 
     default:
         ok(false, "Uhh, unhandled switch for testNum #" + testNum);
         break;
   }
-  
+
   doTest();
 }
 
 function doTest() {
   switch(++testNum) {
     case 1:
         startCallbackTimer();
         makeRequest("authenticate.sjs?user=xmluser1&pass=xmlpass1&realm=xml");
--- a/toolkit/components/passwordmgr/test/test_zzz_finish.html
+++ b/toolkit/components/passwordmgr/test/test_zzz_finish.html
@@ -1,21 +1,22 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Test finalization for Login Manager</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: finalization.
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: finalization **/
 
 
 // Get the pwmgr service