diff --git a/browser/base/content/browser-fullZoom.js b/browser/base/content/browser-fullZoom.js
index d150f18f9b61..8ade7f68650e 100644
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -333,13 +333,13 @@ var FullZoom = {
    * one.
    **/
   _applyPrefToSetting: function FullZoom__applyPrefToSetting(aValue, aBrowser) {
-    if (!this.siteSpecific && !this._inPrivateBrowsing)
+    if ((!this.siteSpecific && !this._inPrivateBrowsing) ||
+        gInPrintPreviewMode)
       return;
 
     var browser = aBrowser || gBrowser.selectedBrowser;
     try {
-      if (gInPrintPreviewMode ||
-          browser.contentDocument instanceof Ci.nsIImageDocument ||
+      if (browser.contentDocument instanceof Ci.nsIImageDocument ||
           this._inPrivateBrowsing)
         ZoomManager.setZoomForBrowser(browser, 1);
       else if (typeof aValue != "undefined")
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 10a5b0be3b3e..37f5de130f33 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1101,14 +1101,18 @@ function HandleAppCommandEvent(evt) {
 }
 
 function prepareForStartup() {
+  var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+
   gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver.onUpdatePageReport, false);
   // Note: we need to listen to untrusted events, because the pluginfinder XBL
   // binding can't fire trusted ones (runs with page privileges).
   gBrowser.addEventListener("PluginNotFound", gMissingPluginInstaller.newMissingPlugin, true, true);
+  gBrowser.addEventListener("PluginCrashed", gMissingPluginInstaller.pluginInstanceCrashed, true, true);
   gBrowser.addEventListener("PluginBlocklisted", gMissingPluginInstaller.newMissingPlugin, true, true);
   gBrowser.addEventListener("PluginOutdated", gMissingPluginInstaller.newMissingPlugin, true, true);
   gBrowser.addEventListener("PluginDisabled", gMissingPluginInstaller.newDisabledPlugin, true, true);
   gBrowser.addEventListener("NewPluginInstalled", gMissingPluginInstaller.refreshBrowser, false);
+  os.addObserver(gMissingPluginInstaller.pluginCrashed, "plugin-crashed", false);
   window.addEventListener("AppCommand", HandleAppCommandEvent, true);
 
   var webNavigation;
@@ -1152,7 +1156,6 @@ function prepareForStartup() {
   // progress notifications for back/forward button updating
   webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"]
                                            .createInstance(Components.interfaces.nsISHistory);
-  var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
   os.addObserver(gBrowser.browsers[0], "browser:purge-session-history", false);
 
   // remove the disablehistory attribute so the browser cleans up, as
@@ -2536,11 +2539,34 @@ function BrowserReloadWithFlags(reloadFlags) {
 }
 
 var PrintPreviewListener = {
+  _printPreviewTab: null,
+  _tabBeforePrintPreview: null,
+
+  getPrintPreviewBrowser: function () {
+    if (!this._printPreviewTab) {
+      this._tabBeforePrintPreview = gBrowser.selectedTab;
+      this._printPreviewTab = gBrowser.loadOneTab("about:blank",
+                                                  { inBackground: false });
+      gBrowser.selectedTab = this._printPreviewTab;
+    }
+    return gBrowser.getBrowserForTab(this._printPreviewTab);
+  },
+  getSourceBrowser: function () {
+    return this._tabBeforePrintPreview ?
+      this._tabBeforePrintPreview.linkedBrowser : gBrowser.selectedBrowser;
+  },
+  getNavToolbox: function () {
+    return gNavToolbox;
+  },
   onEnter: function () {
     gInPrintPreviewMode = true;
     this._toggleAffectedChrome();
   },
   onExit: function () {
+    gBrowser.selectedTab = this._tabBeforePrintPreview;
+    this._tabBeforePrintPreview = null;
+    gBrowser.removeTab(this._printPreviewTab);
+    this._printPreviewTab = null;
     gInPrintPreviewMode = false;
     this._toggleAffectedChrome();
   },
@@ -2572,8 +2598,7 @@ var PrintPreviewListener = {
     this._chromeState.sidebarOpen = !sidebar.hidden;
     this._sidebarCommand = sidebar.getAttribute("sidebarcommand");
 
-    this._chromeState.hadTabStrip = gBrowser.getStripVisibility();
-    gBrowser.setStripVisibilityTo(false);
+    gBrowser.mStrip.setAttribute("moz-collapsed", "true");
 
     var notificationBox = gBrowser.getNotificationBox();
     this._chromeState.notificationsOpen = !notificationBox.notificationsHidden;
@@ -2588,8 +2613,7 @@ var PrintPreviewListener = {
     gFindBar.close();
   },
   _showChrome: function () {
-    if (this._chromeState.hadTabStrip)
-      gBrowser.setStripVisibilityTo(true);
+    gBrowser.mStrip.removeAttribute("moz-collapsed");
 
     if (this._chromeState.notificationsOpen)
       gBrowser.getNotificationBox().notificationsHidden = false;
@@ -2602,11 +2626,6 @@ var PrintPreviewListener = {
   }
 }
 
-function getPPBrowser()
-{
-  return gBrowser;
-}
-
 function getMarkupDocumentViewer()
 {
   return gBrowser.markupDocumentViewer;
@@ -5977,7 +5996,23 @@ function getPluginInfo(pluginElement)
 
 var gMissingPluginInstaller = {
 
+  get CrashSubmit() {
+    delete this.CrashSubmit;
+    Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
+    return this.CrashSubmit;
+  },
+
+  get crashReportHelpURL() {
+    delete this.crashReportHelpURL;
+    let url = formatURL("app.support.baseURL", true);
+    url += "plugin-crashed";
+    this.crashReportHelpURL = url;
+    return this.crashReportHelpURL;
+  },
+
   installSinglePlugin: function (aEvent) {
+    if (!aEvent.isTrusted)
+        return;
     var missingPluginsArray = {};
 
     var pluginInfo = getPluginInfo(aEvent.target);
@@ -5993,6 +6028,8 @@ var gMissingPluginInstaller = {
   },
 
   managePlugins: function (aEvent) {
+    if (!aEvent.isTrusted)
+        return;
     BrowserOpenAddonsMgr("plugins");
     aEvent.stopPropagation();
   },
@@ -6014,6 +6051,11 @@ var gMissingPluginInstaller = {
       aEvent.target.addEventListener("click",
                                      gMissingPluginInstaller.installSinglePlugin,
                                      true);
+      aEvent.target.addEventListener("keydown",
+                                     function(evt) { if (evt.keyCode == evt.DOM_VK_RETURN)
+                                                       gMissingPluginInstaller.installSinglePlugin(evt) },
+                                     true);
+                                                    
     }
 
     let hideBarPrefName = aEvent.type == "PluginOutdated" ?
@@ -6137,6 +6179,133 @@ var gMissingPluginInstaller = {
     aEvent.target.addEventListener("click",
                                    gMissingPluginInstaller.managePlugins,
                                    true);
+    aEvent.target.addEventListener("keydown",
+                                   function(evt) { if (evt.keyCode == evt.DOM_VK_RETURN)
+                                                     gMissingPluginInstaller.managePlugins(evt) },
+                                   true);
+  },
+
+  // Crashed-plugin observer. Notified once per plugin crash, before events
+  // are dispatched to individual plugin instances.
+  pluginCrashed : function(subject, topic, data) {
+    let propertyBag = subject;
+    if (!(propertyBag instanceof Ci.nsIPropertyBag2) ||
+        !(propertyBag instanceof Ci.nsIWritablePropertyBag2))
+     return;
+
+#ifdef MOZ_CRASHREPORTER
+    let minidumpID = subject.getPropertyAsAString("minidumpID");
+    let submitReports = gCrashReporter.submitReports;
+    // The crash reporter wants a DOM element it can append an IFRAME to,
+    // which it uses to submit a form. Let's just give it gBrowser.
+    if (submitReports)
+      gMissingPluginInstaller.CrashSubmit.submit(minidumpID, gBrowser, null, null);
+    propertyBag.setPropertyAsBool("submittedCrashReport", submitReports);
+#endif
+  },
+
+  pluginInstanceCrashed: function (aEvent) {
+    // Evil content could fire a fake event at us, ignore them.
+    if (!aEvent.isTrusted)
+      return;
+
+    if (!(aEvent instanceof Ci.nsIDOMDataContainerEvent))
+      return;
+
+    let submittedReport = aEvent.getData("submittedCrashReport");
+    let pluginName      = aEvent.getData("pluginName");
+
+    // We're expecting this to be a plugin.
+    let plugin = aEvent.target;
+    if (!(plugin instanceof Ci.nsIObjectLoadingContent))
+      return;
+
+    // Force a style flush, so that we ensure our binding is attached.
+    plugin.clientTop;
+
+    let messageString = gNavigatorBundle.getFormattedString("crashedpluginsMessage.title", [pluginName]);
+
+    //
+    // Configure the crashed-plugin placeholder.
+    //
+    let doc = plugin.ownerDocument;
+    let overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
+
+    // The binding has role="link" here, since missing/disabled/blocked
+    // plugin UI has a onclick handler on the whole thing. This isn't needed
+    // for the plugin-crashed UI, because we use actual HTML links in the text.
+    overlay.removeAttribute("role");
+
+#ifdef MOZ_CRASHREPORTER
+    let helpClass = submittedReport ? "submitLink" : "notSubmitLink";
+    let helpLink = doc.getAnonymousElementByAttribute(plugin, "class", helpClass);
+    helpLink.href = gMissingPluginInstaller.crashReportHelpURL;
+    let showClass = submittedReport ? "msg msgSubmitted" : "msg msgNotSubmitted";
+    let textToShow = doc.getAnonymousElementByAttribute(plugin, "class", showClass);
+    textToShow.style.display = "block";
+#endif
+
+    let crashText = doc.getAnonymousElementByAttribute(plugin, "class", "msg msgCrashed");
+    crashText.textContent = messageString;
+
+    let link = doc.getAnonymousElementByAttribute(plugin, "class", "reloadLink");
+    link.addEventListener("click", function(e) { if (e.isTrusted) browser.reload(); }, true);
+
+    let browser = gBrowser.getBrowserForDocument(plugin.ownerDocument
+                                                       .defaultView.top.document);
+    let notificationBox = gBrowser.getNotificationBox(browser);
+
+    // Is the <object>'s size too small to hold what we want to show?
+    let pluginRect = plugin.getBoundingClientRect();
+    // XXX bug 446693. The text-shadow on the submitted-report text at
+    //     the bottom causes scrollHeight to be larger than it should be.
+    let isObjectTooSmall = (overlay.scrollWidth > pluginRect.width) ||
+                           (overlay.scrollHeight - 5 > pluginRect.height);
+    if (isObjectTooSmall) {
+        // Hide the overlay's contents. Use visibility style, so that it
+        // doesn't collapse down to 0x0.
+        overlay.style.visibility = "hidden";
+        // If another plugin on the page was large enough to show our UI, we
+        // don't want to show a notification bar.
+        if (!doc.mozNoPluginCrashedNotification)
+          showNotificationBar();
+    } else {
+        // If a previous plugin on the page was too small and resulted in
+        // adding a notification bar, then remove it because this plugin
+        // instance it big enough to serve as in-content notification.
+        hideNotificationBar();
+        doc.mozNoPluginCrashedNotification = true;
+    }
+
+    function hideNotificationBar() {
+      let notification = notificationBox.getNotificationWithValue("plugin-crashed");
+      if (notification)
+        notificationBox.removeNotification(notification, true);
+    }
+
+    function showNotificationBar() {
+      // If there's already an existing notification bar, don't do anything.
+      let notification = notificationBox.getNotificationWithValue("plugin-crashed");
+      if (notification)
+        return;
+
+      // Configure the notification bar
+      let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
+      let iconURL = "chrome://mozapps/skin/plugins/pluginGeneric-16.png";
+      let label = gNavigatorBundle.getString("crashedpluginsMessage.reloadButton.label");
+      let accessKey = gNavigatorBundle.getString("crashedpluginsMessage.reloadButton.accesskey");
+
+      let buttons = [{
+        label: label,
+        accessKey: accessKey,
+        popup: null,
+        callback: function() { browser.reload(); },
+      }];
+
+      let notification = notificationBox.appendNotification(messageString, "plugin-crashed",
+                                                            iconURL, priority, buttons);
+    }
+
   },
 
   refreshBrowser: function (aEvent) {
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
index 980a69b8a005..d13150fa4f4b 100644
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
@@ -66,6 +66,9 @@ var gAdvancedPane = {
     this.updateModeItems();
 #endif
     this.updateOfflineApps();
+#ifdef MOZ_CRASHREPORTER
+    this.initSubmitCrashes();
+#endif
   },
 
   /**
@@ -139,6 +142,35 @@ var gAdvancedPane = {
     return checkbox.checked ? (this._storedSpellCheck == 2 ? 2 : 1) : 0;
   },
 
+  /**
+   *
+   */
+  initSubmitCrashes: function ()
+  {
+    var checkbox = document.getElementById("submitCrashesBox");
+    try {
+      var cr = Components.classes["@mozilla.org/toolkit/crash-reporter;1"].
+               getService(Components.interfaces.nsICrashReporter);
+      checkbox.checked = cr.submitReports;
+    } catch (e) {
+      checkbox.style.display = "none";
+    }
+  },
+
+  /**
+   *
+   */
+  updateSubmitCrashes: function ()
+  {
+    var checkbox = document.getElementById("submitCrashesBox");
+    try {
+      var cr = Components.classes["@mozilla.org/toolkit/crash-reporter;1"].
+               getService(Components.interfaces.nsICrashReporter);
+      cr.submitReports = checkbox.checked;
+    } catch (e) { }
+  },
+
+
   // NETWORK TAB
 
   /*
diff --git a/browser/components/preferences/advanced.xul b/browser/components/preferences/advanced.xul
index 8ea529675241..fc758706848a 100644
--- a/browser/components/preferences/advanced.xul
+++ b/browser/components/preferences/advanced.xul
@@ -184,7 +184,7 @@
 
 #ifdef HAVE_SHELL_SERVICE
           <!-- System Defaults -->
-          <groupbox id="systemDefaultsGroup" orient="horizontal">
+          <groupbox id="systemDefaultsGroup" orient="vertical">
             <caption label="&systemDefaults.label;"/>
 
             <hbox id="checkDefaultBox" align="center" flex="1">      
@@ -196,6 +196,11 @@
                       oncommand="gAdvancedPane.checkNow()"
                       preference="pref.general.disable_button.default_browser"/>
             </hbox>
+#ifdef MOZ_CRASHREPORTER
+            <checkbox id="submitCrashesBox" flex="1"
+                      oncommand="gAdvancedPane.updateSubmitCrashes();"
+                      label="&submitCrashes.label;" accesskey="&submitCrashes.accesskey;"/>
+#endif
           </groupbox>
 #endif
         </tabpanel>
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 0550d4fcf5d6..19974e9a1021 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -74,6 +74,9 @@ blockedpluginsMessage.infoButton.label=Details…
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=Update Plugins…
 blockedpluginsMessage.searchButton.accesskey=U
+crashedpluginsMessage.title=The %S plugin has crashed.
+crashedpluginsMessage.reloadButton.label=Reload page
+crashedpluginsMessage.reloadButton.accesskey=R
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index 71210c46152e..3cf951cabd7f 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -25,6 +25,8 @@
 <!ENTITY alwaysCheckDefault.accesskey    "w">
 <!ENTITY checkNow.label                  "Check Now">
 <!ENTITY checkNow.accesskey              "N">
+<!ENTITY submitCrashes.label             "Submit crash reports">
+<!ENTITY submitCrashes.accesskey         "S">
 
 <!ENTITY networkTab.label                "Network">
 
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 9850fcd593ac..39be5a405cbb 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -623,15 +623,9 @@ HAS_OGLES = @HAS_OGLES@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
-NS_OSSO 	= @NS_OSSO@
-MOZ_PLATFORM_HILDON = @MOZ_PLATFORM_HILDON@
-
-LIBHILDONMIME_CFLAGS	= @LIBHILDONMIME_CFLAGS@
-LIBHILDONMIME_LIBS	= @LIBHILDONMIME_LIBS@
-LIBOSSO_CFLAGS 	= @LIBOSSO_CFLAGS@
-LIBOSSO_LIBS 	= @LIBOSSO_LIBS@
-LIBHILDONFM_CFLAGS	= @LIBHILDONFM_CFLAGS@
-LIBHILDONFM_LIBS	= @LIBHILDONFM_LIBS@
+MOZ_PLATFORM_MAEMO = @MOZ_PLATFORM_MAEMO@
+MOZ_PLATFORM_MAEMO_CFLAGS	= @MOZ_PLATFORM_MAEMO_CFLAGS@
+MOZ_PLATFORM_MAEMO_LIBS 	= @MOZ_PLATFORM_MAEMO_LIBS@
 
 MOZ_ENABLE_LIBCONIC = @MOZ_ENABLE_LIBCONIC@
 LIBCONIC_CFLAGS     = @LIBCONIC_CFLAGS@
diff --git a/config/rules.mk b/config/rules.mk
index 002650776f61..c6b6d742af41 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -380,6 +380,7 @@ _OBJS			= \
 	$(JRI_STUB_CFILES) \
 	$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
 	$(CSRCS:.c=.$(OBJ_SUFFIX)) \
+	$(SSRCS:.S=.$(OBJ_SUFFIX)) \
 	$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
 	$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
 	$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
diff --git a/config/system-headers b/config/system-headers
index 890ead5340bc..d695f52f1297 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1009,12 +1009,10 @@ hunspell.hxx
 #if MOZ_NATIVE_BZ2==1
 bzlib.h
 #endif
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
 hildon-uri.h
 hildon-mime.h
 hildon-file-chooser-dialog.h
-#endif
-#ifdef NS_OSSO
 libosso.h
 osso-mem.h
 #endif
diff --git a/configure.in b/configure.in
index 0c7d4719c877..a641ea9572bf 100644
--- a/configure.in
+++ b/configure.in
@@ -403,28 +403,28 @@ else
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(WINDRES, windres, :)
     if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
+        HOST_CC='$(CC)'
     fi
     if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
+        HOST_CFLAGS='$(CFLAGS)'
     fi
     if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
+        HOST_CXX='$(CXX)'
     fi
     if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
+        HOST_CXXFLAGS='$(CXXFLAGS)'
     fi
     if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
+        HOST_LDFLAGS='$(LDFLAGS)'
     fi
     if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
+        HOST_RANLIB='$(RANLIB)'
     fi
     if test -z "$HOST_AR"; then
-        HOST_AR="$AR"
+        HOST_AR='$(AR)'
     fi
     if test -z "$HOST_AR_FLAGS"; then
-        HOST_AR_FLAGS="$AR_FLAGS"
+        HOST_AR_FLAGS='$(AR_FLAGS)'
     fi
 fi
 
@@ -1730,7 +1730,6 @@ case "$host" in
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-    MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
     ;;
 
 *-linux*|*-kfreebsd*-gnu)
@@ -1916,6 +1915,7 @@ case "$target" in
         
         LDFLAGS=$_SAVE_LDFLAGS
     fi
+    MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
     ;;
 
 *-freebsd*)
@@ -4901,10 +4901,10 @@ cairo-cocoa)
     AC_DEFINE(XP_MACOSX)
     TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
     TK_CFLAGS="-DNO_X11"
-    LDFLAGS="$LDFLAGS -framework Cocoa"
+    LDFLAGS="$LDFLAGS -framework Cocoa -lobjc"
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
-    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     MOZ_FS_LAYOUT=bundle
     MOZ_WEBGL=1
     ;;
@@ -6408,47 +6408,78 @@ AC_SUBST(LIBCONIC_CFLAGS)
 AC_SUBST(LIBCONIC_LIBS)
  
 dnl ========================================================
-dnl = Hildon and OSSO checks
+dnl = Maemo checks
 dnl ========================================================
-PKG_CHECK_MODULES(LIBHILDONMIME,libhildonmime,
-                  MOZ_PLATFORM_HILDON=1,
-                  MOZ_PLATFORM_HILDON=)
-if test $MOZ_PLATFORM_HILDON; then
-   AC_DEFINE(MOZ_PLATFORM_HILDON)
-   X11_COMPOSITED_PLUGINS="yes"
+
+MAEMO_SDK_TARGET_VER=-1
+
+MOZ_ARG_WITH_STRING(maemo-version,
+[  --with-maemo-version=MAEMO_SDK_TARGET_VER
+                        Maemo SDK Version],
+  MAEMO_SDK_TARGET_VER=$withval)
+
+case "$MAEMO_SDK_TARGET_VER" in
+5)
+    MOZ_PLATFORM_MAEMO=5
+    ;;
+
+6)
+    MOZ_PLATFORM_MAEMO=6
+    ;;
+
+-1)
+    dnl We aren't compiling for Maemo, move on.
+    ;;
+*)
+    AC_MSG_ERROR([Unknown Maemo Version.  Try setting --with-maemo-version to 5 or 6.])
+    ;;
+esac
+
+if test $MOZ_PLATFORM_MAEMO; then
+   AC_DEFINE_UNQUOTED([MOZ_PLATFORM_MAEMO], $MOZ_PLATFORM_MAEMO)
+
+   if test -z "$MOZ_ENABLE_DBUS"; then
+       AC_MSG_ERROR([DBus is required when building for Maemo])
+   fi
+   
+   MOZ_GFX_OPTIMIZE_MOBILE=1
+   MOZ_WEBGL_GLX=
+
+   if test $MOZ_PLATFORM_MAEMO = 5; then
+      dnl if we have Xcomposite we should also have Xdamage and Xfixes
+      AC_CHECK_HEADERS([X11/extensions/Xdamage.h], [],
+                       [AC_MSG_ERROR([Couldn't find X11/extensions/Xdamage.h which is required for composited plugins.])])
+      AC_CHECK_LIB(Xcomposite, XCompositeRedirectWindow, [XCOMPOSITE_LIBS="-lXcomposite -lXdamage -lXfixes"],
+                   [MISSING_X="$MISSING_X -lXcomposite"], $XLIBS)
+
+      AC_SUBST(XCOMPOSITE_LIBS)
+
+      PKG_CHECK_MODULES(LIBHILDONMIME,libhildonmime, _LIB_FOUND=1, _LIB_FOUND=)
+      MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBHILDONMIME_LIBS"
+      MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBHILDONMIME_CFLAGS"
+      if test -z "$_LIB_FOUND"; then
+         AC_MSG_ERROR([Hildon Mime is required when building for Maemo])
+      fi
+
+
+      PKG_CHECK_MODULES(LIBOSSO,libosso, _LIB_FOUND=1, _LIB_FOUND=)
+      MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBOSSO_LIBS"
+      MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBOSSO_CFLAGS"
+      if test -z "$_LIB_FOUND"; then
+         AC_MSG_ERROR([LibOSSO is required when building for Maemo])
+      fi
+
+      PKG_CHECK_MODULES(LIBHILDONFM,hildon-fm-2, _LIB_FOUND=1, _LIB_FOUND=)
+      MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBHILDONFM_LIBS"
+      MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBHILDONFM_CFLAGS"
+      if test -z "$_LIB_FOUND"; then
+         AC_MSG_ERROR([Hildon FM-2 is required when building for Maemo])
+      fi
+   fi
+
+   AC_SUBST(MOZ_PLATFORM_MAEMO_LIBS)
+   AC_SUBST(MOZ_PLATFORM_MAEMO_CFLAGS)
 fi
-AC_SUBST(LIBHILDONMIME_CFLAGS)
-AC_SUBST(LIBHILDONMIME_LIBS)
-
-if test "$X11_COMPOSITED_PLUGINS" = "yes"; then
-    dnl if we have Xcomposite we should also have Xdamage and Xfixes
-    AC_CHECK_HEADERS([X11/extensions/Xdamage.h], [],
-                     [AC_MSG_ERROR([Couldn't find X11/extentsions/Xdamage.h which is required for composited plugins.])])
-    AC_CHECK_LIB(Xcomposite, XCompositeRedirectWindow, [XCOMPOSITE_LIBS="-lXcomposite -lXdamage -lXfixes"],
-                 [MISSING_X="$MISSING_X -lXcomposite"], $XLIBS)
-fi
-AC_SUBST(XCOMPOSITE_LIBS)
-
-PKG_CHECK_MODULES(LIBOSSO,libosso,
-                  NS_OSSO=1,
-                  NS_OSSO=)
-
-if test $NS_OSSO; then
-    if test -z "$MOZ_ENABLE_DBUS"; then
-        AC_MSG_ERROR([DBus is required when building for OSSO])
-    fi
-    AC_DEFINE(NS_OSSO)
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-    MOZ_WEBGL_GLX=
-fi
-AC_SUBST(LIBOSSO_CFLAGS)
-AC_SUBST(LIBOSSO_LIBS)
-
-PKG_CHECK_MODULES(LIBHILDONFM,hildon-fm-2,
-                  NS_HILDONFM=1,
-                  NS_HILDONFM=)
-AC_SUBST(LIBHILDONFM_CFLAGS)
-AC_SUBST(LIBHILDONFM_LIBS)
 
 dnl ========================================================
 dnl = faststripe theme
@@ -8018,9 +8049,7 @@ AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
-AC_SUBST(MOZ_PLATFORM_HILDON)
-AC_SUBST(NS_OSSO)
-AC_SUBST(NS_MAEMO_LOCATION)
+AC_SUBST(MOZ_PLATFORM_MAEMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_MATHML)
 AC_SUBST(MOZ_PERMISSIONS)
diff --git a/content/base/public/nsIObjectLoadingContent.idl b/content/base/public/nsIObjectLoadingContent.idl
index f0a83e888ce1..30234fd64084 100644
--- a/content/base/public/nsIObjectLoadingContent.idl
+++ b/content/base/public/nsIObjectLoadingContent.idl
@@ -124,5 +124,6 @@ interface nsIObjectLoadingContent : nsISupports
    */
   [noscript] nsIFrame getPrintFrame();
 
-  [noscript] void pluginCrashed();
+  [noscript] void pluginCrashed(in AString pluginName,
+                                in boolean submittedCrashReport);
 };
diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp
index d5b7b4862345..d795d56a94f4 100644
--- a/content/base/src/nsContentList.cpp
+++ b/content/base/src/nsContentList.cpp
@@ -296,6 +296,109 @@ NS_GetContentList(nsINode* aRootNode, nsIAtom* aMatchAtom,
   return list;
 }
 
+// Hashtable for storing nsCacheableFuncStringContentList
+static PLDHashTable gFuncStringContentListHashTable;
+
+struct FuncStringContentListHashEntry : public PLDHashEntryHdr
+{
+  nsCacheableFuncStringContentList* mContentList;
+};
+
+static PLDHashNumber
+FuncStringContentListHashtableHashKey(PLDHashTable *table, const void *key)
+{
+  const nsFuncStringCacheKey* funcStringKey =
+    static_cast<const nsFuncStringCacheKey *>(key);
+  return funcStringKey->GetHash();
+}
+
+static PRBool
+FuncStringContentListHashtableMatchEntry(PLDHashTable *table,
+                               const PLDHashEntryHdr *entry,
+                               const void *key)
+{
+  const FuncStringContentListHashEntry *e =
+    static_cast<const FuncStringContentListHashEntry *>(entry);
+  const nsFuncStringCacheKey* ourKey =
+    static_cast<const nsFuncStringCacheKey *>(key);
+
+  return e->mContentList->Equals(ourKey);
+}
+
+already_AddRefed<nsContentList>
+NS_GetFuncStringContentList(nsINode* aRootNode,
+                            nsContentListMatchFunc aFunc,
+                            nsContentListDestroyFunc aDestroyFunc,
+                            void* aData,
+                            const nsAString& aString)
+{
+  NS_ASSERTION(aRootNode, "content list has to have a root");
+
+  nsCacheableFuncStringContentList* list = nsnull;
+
+  static PLDHashTableOps hash_table_ops =
+  {
+    PL_DHashAllocTable,
+    PL_DHashFreeTable,
+    FuncStringContentListHashtableHashKey,
+    FuncStringContentListHashtableMatchEntry,
+    PL_DHashMoveEntryStub,
+    PL_DHashClearEntryStub,
+    PL_DHashFinalizeStub
+  };
+
+  // Initialize the hashtable if needed.
+  if (!gFuncStringContentListHashTable.ops) {
+    PRBool success = PL_DHashTableInit(&gFuncStringContentListHashTable,
+                                       &hash_table_ops, nsnull,
+                                       sizeof(FuncStringContentListHashEntry),
+                                       16);
+
+    if (!success) {
+      gFuncStringContentListHashTable.ops = nsnull;
+    }
+  }
+
+  FuncStringContentListHashEntry *entry = nsnull;
+  // First we look in our hashtable.  Then we create a content list if needed
+  if (gFuncStringContentListHashTable.ops) {
+    nsFuncStringCacheKey hashKey(aRootNode, aFunc, aString);
+
+    // A PL_DHASH_ADD is equivalent to a PL_DHASH_LOOKUP for cases
+    // when the entry is already in the hashtable.
+    entry = static_cast<FuncStringContentListHashEntry *>
+                       (PL_DHashTableOperate(&gFuncStringContentListHashTable,
+                                             &hashKey,
+                                             PL_DHASH_ADD));
+    if (entry)
+      list = entry->mContentList;
+  }
+
+  if (!list) {
+    // We need to create a ContentList and add it to our new entry, if
+    // we have an entry
+    list = new nsCacheableFuncStringContentList(aRootNode, aFunc, aDestroyFunc, aData, aString);
+    if (entry) {
+      if (list)
+        entry->mContentList = list;
+      else
+        PL_DHashTableRawRemove(&gContentListHashTable, entry);
+    }
+
+    NS_ENSURE_TRUE(list, nsnull);
+  } else {
+    // List was already in the hashtable; clean up our new aData
+    if (aDestroyFunc) {
+      (*aDestroyFunc)(aData);
+    }
+  }
+
+  NS_ADDREF(list);
+
+  // Don't cache these lists globally
+
+  return list;
+}
 
 // nsContentList implementation
 
@@ -450,7 +553,7 @@ nsContentList::NodeWillBeDestroyed(const nsINode* aNode)
 {
   // We shouldn't do anything useful from now on
 
-  RemoveFromHashtable();
+  RemoveFromCaches();
   mRootNode = nsnull;
 
   // We will get no more updates, so we can never know we're up to
@@ -913,6 +1016,29 @@ nsContentList::BringSelfUpToDate(PRBool aDoFlush)
                "PopulateSelf dod not bring content list up to date!");
 }
 
+nsCacheableFuncStringContentList::~nsCacheableFuncStringContentList()
+{
+  RemoveFromFuncStringHashtable();
+}
+
+void
+nsCacheableFuncStringContentList::RemoveFromFuncStringHashtable()
+{
+  if (!gFuncStringContentListHashTable.ops) {
+    return;
+  }
+
+  nsFuncStringCacheKey key(mRootNode, mFunc, mString);
+  PL_DHashTableOperate(&gFuncStringContentListHashTable,
+                       &key,
+                       PL_DHASH_REMOVE);
+
+  if (gFuncStringContentListHashTable.entryCount == 0) {
+    PL_DHashTableFinish(&gFuncStringContentListHashTable);
+    gFuncStringContentListHashTable.ops = nsnull;
+  }
+}
+
 #ifdef DEBUG_CONTENT_LIST
 void
 nsContentList::AssertInSync()
diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h
index e5e49bdf789f..fe7e00fc6441 100644
--- a/content/base/src/nsContentList.h
+++ b/content/base/src/nsContentList.h
@@ -55,6 +55,7 @@
 #include "nsINameSpaceManager.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
+#include "nsCRT.h"
 
 // Magic namespace id that means "match all namespaces".  This is
 // negative so it won't collide with actual namespace constants.
@@ -396,6 +397,15 @@ protected:
     Reset();
   }
 
+  /**
+   * To be called from non-destructor locations that want to remove from caches.
+   * Needed because if subclasses want to have cache behavior they can't just
+   * override RemoveFromHashtable(), since we call that in our destructor.
+   */
+  virtual void RemoveFromCaches() {
+    RemoveFromHashtable();
+  }
+
   /**
    * Function to use to determine whether a piece of content matches
    * our criterion
@@ -434,8 +444,69 @@ protected:
 #endif
 };
 
+/**
+ * A class of cacheable content list; cached on the combination of aRootNode + aFunc + aDataString
+ */
+class nsCacheableFuncStringContentList;
+
+class NS_STACK_CLASS nsFuncStringCacheKey {
+public:
+  nsFuncStringCacheKey(nsINode* aRootNode,
+                       nsContentListMatchFunc aFunc,
+                       const nsAString& aString) :
+    mRootNode(aRootNode),
+    mFunc(aFunc),
+    mString(aString)
+    {}
+
+  PRUint32 GetHash(void) const
+  {
+    return NS_PTR_TO_INT32(mRootNode) ^ (NS_PTR_TO_INT32(mFunc) << 12) ^
+      nsCRT::HashCode(PromiseFlatString(mString).get());
+  }
+
+private:
+  friend class nsCacheableFuncStringContentList;
+
+  nsINode* const mRootNode;
+  const nsContentListMatchFunc mFunc;
+  const nsAString& mString;
+};
+
+class nsCacheableFuncStringContentList : public nsContentList {
+public:
+  nsCacheableFuncStringContentList(nsINode* aRootNode,
+                                   nsContentListMatchFunc aFunc,
+                                   nsContentListDestroyFunc aDestroyFunc,
+                                   void* aData,
+                                   const nsAString& aString) :
+    nsContentList(aRootNode, aFunc, aDestroyFunc, aData),
+    mString(aString)
+  {}
+
+  virtual ~nsCacheableFuncStringContentList();
+
+  PRBool Equals(const nsFuncStringCacheKey* aKey) {
+    return mRootNode == aKey->mRootNode && mFunc == aKey->mFunc &&
+      mString == aKey->mString;
+  }
+protected:
+  virtual void RemoveFromCaches() {
+    RemoveFromFuncStringHashtable();
+  }
+  void RemoveFromFuncStringHashtable();
+
+  nsString mString;
+};
+
 already_AddRefed<nsContentList>
 NS_GetContentList(nsINode* aRootNode, nsIAtom* aMatchAtom,
                   PRInt32 aMatchNameSpaceId);
 
+already_AddRefed<nsContentList>
+NS_GetFuncStringContentList(nsINode* aRootNode,
+                            nsContentListMatchFunc aFunc,
+                            nsContentListDestroyFunc aDestroyFunc,
+                            void* aData,
+                            const nsAString& aString);
 #endif // nsContentList_h___
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index f231c2662f2e..6958c4cc9275 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1798,6 +1798,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnloadBlocker)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDOMImplementation)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOriginalDocument)
 
   // An element will only be in the linkmap as long as it's in the
   // document, so we'll traverse the table here instead of from the element.
@@ -1851,6 +1852,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDisplayDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDOMImplementation)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOriginalDocument)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK_USERDATA
 
@@ -2859,21 +2861,24 @@ nsDocument::GetElementsByClassNameHelper(nsINode* aRootNode,
       aRootNode->GetOwnerDoc()->GetCompatibilityMode() ==
         eCompatibility_NavQuirks ?
           eIgnoreCase : eCaseMatters;
-  
-    elements = new nsContentList(aRootNode, MatchClassNames,
-                                 DestroyClassNameArray, info);
+
+    elements =
+      NS_GetFuncStringContentList(aRootNode, MatchClassNames,
+                                  DestroyClassNameArray, info,
+                                  aClasses).get();
   } else {
     delete info;
     info = nsnull;
     elements = new nsBaseContentList();
+    NS_IF_ADDREF(elements);
   }
   if (!elements) {
     delete info;
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
+  // Transfer ownership
   *aReturn = elements;
-  NS_ADDREF(*aReturn);
 
   return NS_OK;
 }
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 7618ae0a8e38..df5fd3a78a83 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -44,9 +44,13 @@
 
 // Interface headers
 #include "imgILoader.h"
+#include "nsEventDispatcher.h"
 #include "nsIContent.h"
 #include "nsIDocShell.h"
 #include "nsIDocument.h"
+#include "nsIDOMDataContainerEvent.h"
+#include "nsIDOMDocumentEvent.h"
+#include "nsIDOMEventTarget.h"
 #include "nsIExternalProtocolHandler.h"
 #include "nsIEventStateManager.h"
 #include "nsIObjectFrame.h"
@@ -54,6 +58,7 @@
 #include "nsIPluginHost.h"
 #include "nsIPluginInstance.h"
 #include "nsIPresShell.h"
+#include "nsIPrivateDOMEvent.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIStreamConverterService.h"
@@ -79,6 +84,7 @@
 #include "nsNetUtil.h"
 #include "nsMimeTypes.h"
 #include "nsStyleUtil.h"
+#include "nsGUIEvent.h"
 
 // Concrete classes
 #include "nsFrameLoader.h"
@@ -200,9 +206,6 @@ nsPluginErrorEvent::Run()
     case ePluginOutdated:
       type = NS_LITERAL_STRING("PluginOutdated");
       break;
-    case ePluginCrashed:
-      type = NS_LITERAL_STRING("PluginCrashed");
-      break;
     default:
       return NS_OK;
   }
@@ -212,6 +215,79 @@ nsPluginErrorEvent::Run()
   return NS_OK;
 }
 
+/**
+ * A task for firing PluginCrashed DOM Events.
+ */
+class nsPluginCrashedEvent : public nsRunnable {
+public:
+  nsCOMPtr<nsIContent> mContent;
+  nsString mPluginName;
+  PRBool mSubmittedCrashReport;
+
+  nsPluginCrashedEvent(nsIContent* aContent,
+                       const nsAString& aPluginName,
+                       PRBool submittedCrashReport)
+    : mContent(aContent),
+      mPluginName(aPluginName),
+      mSubmittedCrashReport(submittedCrashReport)
+  {}
+
+  ~nsPluginCrashedEvent() {}
+
+  NS_IMETHOD Run();
+};
+
+NS_IMETHODIMP
+nsPluginCrashedEvent::Run()
+{
+  LOG(("OBJLC []: Firing plugin crashed event for content %p\n",
+       mContent.get()));
+
+  nsCOMPtr<nsIDOMDocumentEvent> domEventDoc =
+    do_QueryInterface(mContent->GetDocument());
+  if (!domEventDoc) {
+    NS_WARNING("Couldn't get document for PluginCrashed event!");
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIDOMEvent> event;
+  domEventDoc->CreateEvent(NS_LITERAL_STRING("datacontainerevents"),
+                           getter_AddRefs(event));
+  nsCOMPtr<nsIPrivateDOMEvent> privateEvent(do_QueryInterface(event));
+  nsCOMPtr<nsIDOMDataContainerEvent> containerEvent(do_QueryInterface(event));
+  if (!privateEvent || !containerEvent) {
+    NS_WARNING("Couldn't QI event for PluginCrashed event!");
+    return NS_OK;
+  }
+
+  event->InitEvent(NS_LITERAL_STRING("PluginCrashed"), PR_TRUE, PR_TRUE);
+  privateEvent->SetTrusted(PR_TRUE);
+  privateEvent->GetInternalNSEvent()->flags |= NS_EVENT_FLAG_ONLY_CHROME_DISPATCH;
+  
+  nsCOMPtr<nsIWritableVariant> variant;
+
+  // add a "pluginName" property to this event
+  variant = do_CreateInstance("@mozilla.org/variant;1");
+  if (!variant) {
+    NS_WARNING("Couldn't create pluginName variant for PluginCrashed event!");
+    return NS_OK;
+  }
+  variant->SetAsAString(mPluginName);
+  containerEvent->SetData(NS_LITERAL_STRING("pluginName"), variant);
+
+  // add a "submittedCrashReport" property to this event
+  variant = do_CreateInstance("@mozilla.org/variant;1");
+  if (!variant) {
+    NS_WARNING("Couldn't create crashSubmit variant for PluginCrashed event!");
+    return NS_OK;
+  }
+  variant->SetAsBool(mSubmittedCrashReport);
+  containerEvent->SetData(NS_LITERAL_STRING("submittedCrashReport"), variant);
+
+  nsEventDispatcher::DispatchDOMEvent(mContent, nsnull, event, nsnull, nsnull);
+  return NS_OK;
+}
+
 class AutoNotifier {
   public:
     AutoNotifier(nsObjectLoadingContent* aContent, PRBool aNotify) :
@@ -955,6 +1031,9 @@ nsObjectLoadingContent::ObjectState() const
         case ePluginBlocklisted:
           state |= NS_EVENT_STATE_HANDLER_BLOCKED;
           break;
+        case ePluginCrashed:
+          state |= NS_EVENT_STATE_HANDLER_CRASHED;
+          break;
         case ePluginUnsupported:
           state |= NS_EVENT_STATE_TYPE_UNSUPPORTED;
           break;
@@ -1929,11 +2008,19 @@ nsObjectLoadingContent::SetAbsoluteScreenPosition(nsIDOMElement* element,
 }
 
 NS_IMETHODIMP
-nsObjectLoadingContent::PluginCrashed()
+nsObjectLoadingContent::PluginCrashed(const nsAString& pluginName,
+                                      PRBool submittedCrashReport)
 {
+  AutoNotifier notifier(this, PR_TRUE);
   UnloadContent();
   mFallbackReason = ePluginCrashed;
   nsCOMPtr<nsIContent> thisContent = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
-  FirePluginError(thisContent, mFallbackReason);
+  nsCOMPtr<nsIRunnable> ev = new nsPluginCrashedEvent(thisContent,
+                                                      pluginName,
+                                                      submittedCrashReport);
+  nsresult rv = NS_DispatchToCurrentThread(ev);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("failed to dispatch nsPluginCrashedEvent");
+  }
   return NS_OK;
 }
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index 93b8412d79f6..da9dcfb6ee14 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -66,16 +66,15 @@ endif
 
 ifdef MOZ_WEBGL
 
-ifeq (1_1,$(MOZ_X11)_$(NS_OSSO))
+ifdef MOZ_X11
+ifdef MOZ_PLATFORM_MAEMO
 WEBGL_PLATFORM = EGL
 DEFINES += -DUSE_GLES2
-endif
-
-ifeq (1_,$(MOZ_X11)_$(NS_OSSO))
+else
 WEBGL_PLATFORM = GLX
 EXTRA_DSO_LIBS += X11
 endif
-
+endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 ifdef WINCE
diff --git a/content/canvas/src/nsGLPbufferEGL.cpp b/content/canvas/src/nsGLPbufferEGL.cpp
index a850578bfbfc..f5ca1431f0aa 100644
--- a/content/canvas/src/nsGLPbufferEGL.cpp
+++ b/content/canvas/src/nsGLPbufferEGL.cpp
@@ -163,7 +163,7 @@ nsGLPbufferEGL::Init(mozilla::WebGLContext *priv)
 {
     mPriv = priv;
 
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
     // Maemo has missing DSO dependencies on their OpenGL libraries;
     // so ensure that the prerequisite libs are loaded in the process
     // before loading GL.  An alternate approach is to use LD_PRELOAD.
@@ -199,7 +199,7 @@ nsGLPbufferEGL::Init(mozilla::WebGLContext *priv)
 
     gEGLWrap.fBindAPI (EGL_OPENGL_ES_API);
 
-#if defined(MOZ_X11) && defined(NS_OSSO)
+#if defined(MOZ_X11) && defined(MOZ_PLATFORM_MAEMO)
     EGLint attribs[] = {
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
         EGL_SURFACE_TYPE, EGL_PIXMAP_BIT,
@@ -477,7 +477,7 @@ nsGLPbufferEGL::SwapBuffers()
 gfxASurface*
 nsGLPbufferEGL::ThebesSurface()
 {
-#if defined(MOZ_X11) && defined(NS_OSSO)
+#if defined(MOZ_X11) && defined(MOZ_PLATFORM_MAEMO)
     if (getenv("IMAGE"))
         return mThebesSurface;
     return mXlibSurface;
diff --git a/content/events/public/nsIEventStateManager.h b/content/events/public/nsIEventStateManager.h
index ebb866014b8e..e0f57b12e20d 100644
--- a/content/events/public/nsIEventStateManager.h
+++ b/content/events/public/nsIEventStateManager.h
@@ -197,4 +197,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventStateManager, NS_IEVENTSTATEMANAGER_IID)
 
 #define NS_EVENT_STATE_INDETERMINATE 0x04000000 // CSS3-Selectors
 
+// Handler for the content has crashed
+#define NS_EVENT_STATE_HANDLER_CRASHED \
+                                     0x08000000
+
 #endif // nsIEventStateManager_h__
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 893cde451034..e09e38f0150e 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -63,9 +63,9 @@ class imgIContainer;
 class nsDOMDataTransfer;
 
 // mac uses click-hold context menus, a holdover from 4.x
-// touch screens (like hildon) could use this also, 
+// touch screens (like maemo) could use this also, 
 // perhaps we should move to NS_TOUCHSCREEN
-#if defined(XP_MACOSX) || defined(MOZ_PLATFORM_HILDON)
+#if defined(XP_MACOSX) || defined(MOZ_PLATFORM_MAEMO)
 #define CLICK_HOLD_CONTEXT_MENUS 1
 #endif
 
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 7b51f8c4b9ee..fb6f3e8f4004 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -60,8 +60,6 @@
 #include "nsIFormControl.h"
 #include "nsIForm.h"
 #include "nsIFormSubmission.h"
-#include "nsITextControlFrame.h"
-#include "nsIRadioControlFrame.h"
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsIFormControlFrame.h"
@@ -81,7 +79,6 @@
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMHTMLCollection.h"
-#include "nsICheckboxControlFrame.h"
 #include "nsLinebreakConverter.h" //to strip out carriage returns
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
@@ -98,7 +95,6 @@
 #include "nsRuleData.h"
 
 // input type=radio
-#include "nsIRadioControlFrame.h"
 #include "nsIRadioGroupContainer.h"
 
 // input type=file
@@ -1368,20 +1364,10 @@ nsHTMLInputElement::SetCheckedInternal(PRBool aChecked, PRBool aNotify)
   //
   // Notify the frame
   //
-  nsIFrame* frame = GetPrimaryFrame();
-  if (frame) {
-    nsPresContext *presContext = GetPresContext();
-
-    if (mType == NS_FORM_INPUT_CHECKBOX) {
-      nsICheckboxControlFrame* checkboxFrame = do_QueryFrame(frame);
-      if (checkboxFrame) {
-        checkboxFrame->OnChecked(presContext, aChecked);
-      }
-    } else if (mType == NS_FORM_INPUT_RADIO) {
-      nsIRadioControlFrame* radioFrame = do_QueryFrame(frame);
-      if (radioFrame) {
-        radioFrame->OnChecked(presContext, aChecked);
-      }
+  if (mType == NS_FORM_INPUT_CHECKBOX || mType == NS_FORM_INPUT_RADIO) {
+    nsIFrame* frame = GetPrimaryFrame();
+    if (frame) {
+      frame->InvalidateOverflowRect();
     }
   }
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 6d4c541248ce..36c3d930329a 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -2280,17 +2280,18 @@ NS_IMETHODIMP
 nsHTMLDocument::GetElementsByName(const nsAString& aElementName,
                                   nsIDOMNodeList** aReturn)
 {
-  void* elementNameData = new nsString(aElementName);
+  nsString* elementNameData = new nsString(aElementName);
   NS_ENSURE_TRUE(elementNameData, NS_ERROR_OUT_OF_MEMORY);
   nsContentList* elements =
-    new nsContentList(this,
-                      MatchNameAttribute,
-                      nsContentUtils::DestroyMatchString,
-                      elementNameData);
+    NS_GetFuncStringContentList(this,
+                                MatchNameAttribute,
+                                nsContentUtils::DestroyMatchString,
+                                elementNameData,
+                                *elementNameData).get();
   NS_ENSURE_TRUE(elements, NS_ERROR_OUT_OF_MEMORY);
 
+  // Transfer ownership
   *aReturn = elements;
-  NS_ADDREF(*aReturn);
 
   return NS_OK;
 }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index db0abb87d1c7..e3fede4be1ab 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2112,8 +2112,8 @@ nsDocShell::HistoryPurged(PRInt32 aNumEntries)
     // eviction.  We need to adjust by the number of entries that we
     // just purged from history, so that we look at the right session history
     // entries during eviction.
-    mPreviousTransIndex = PR_MAX(-1, mPreviousTransIndex - aNumEntries);
-    mLoadedTransIndex = PR_MAX(0, mLoadedTransIndex - aNumEntries);
+    mPreviousTransIndex = NS_MAX(-1, mPreviousTransIndex - aNumEntries);
+    mLoadedTransIndex = NS_MAX(0, mLoadedTransIndex - aNumEntries);
 
     PRInt32 count = mChildList.Count();
     for (PRInt32 i = 0; i < count; ++i) {
diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index 992fae8d7098..fdd9b8ef5b7f 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -115,6 +115,6 @@ ifdef MOZ_ENABLE_DBUS
  EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
 endif
 
-ifdef MOZ_PLATFORM_HILDON
-EXTRA_DSO_LDOPTS += $(LIBHILDONMIME_LIBS)
+ifdef MOZ_PLATFORM_MAEMO
+EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif
diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp
index ffd132642abf..9b946b96d148 100644
--- a/docshell/shistory/src/nsSHistory.cpp
+++ b/docshell/shistory/src/nsSHistory.cpp
@@ -551,7 +551,7 @@ nsSHistory::PurgeHistory(PRInt32 aEntries)
   if (mLength <= 0 || aEntries <= 0)
     return NS_ERROR_FAILURE;
 
-  aEntries = PR_MIN(aEntries, mLength);
+  aEntries = NS_MIN(aEntries, mLength);
   
   PRBool purgeHistory = PR_TRUE;
   // Notify the listener about the history purge
@@ -813,13 +813,13 @@ nsSHistory::EvictWindowContentViewers(PRInt32 aFromIndex, PRInt32 aToIndex)
     if (endIndex <= 0) {
       return;
     }
-    startIndex = PR_MAX(0, aFromIndex - gHistoryMaxViewers);
+    startIndex = NS_MAX(0, aFromIndex - gHistoryMaxViewers);
   } else { // going backward
     startIndex = aToIndex + gHistoryMaxViewers + 1;
     if (startIndex >= mLength) {
       return;
     }
-    endIndex = PR_MIN(mLength, aFromIndex + gHistoryMaxViewers + 1);
+    endIndex = NS_MIN(mLength, aFromIndex + gHistoryMaxViewers + 1);
   }
 
 #ifdef DEBUG
@@ -913,8 +913,8 @@ nsSHistory::EvictGlobalContentViewer()
       // viewer.  There could be up to gHistoryMaxViewers content viewers,
       // but we don't know whether they are before or after the mIndex position
       // in the SHEntry list.  Just check both sides, to be safe.
-      PRInt32 startIndex = PR_MAX(0, shist->mIndex - gHistoryMaxViewers);
-      PRInt32 endIndex = PR_MIN(shist->mLength - 1,
+      PRInt32 startIndex = NS_MAX(0, shist->mIndex - gHistoryMaxViewers);
+      PRInt32 endIndex = NS_MIN(shist->mLength - 1,
                                 shist->mIndex + gHistoryMaxViewers);
       nsCOMPtr<nsISHTransaction> trans;
       shist->GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
@@ -1006,8 +1006,8 @@ nsSHistory::EvictGlobalContentViewer()
 NS_IMETHODIMP
 nsSHistory::EvictExpiredContentViewerForEntry(nsISHEntry *aEntry)
 {
-  PRInt32 startIndex = PR_MAX(0, mIndex - gHistoryMaxViewers);
-  PRInt32 endIndex = PR_MIN(mLength - 1,
+  PRInt32 startIndex = NS_MAX(0, mIndex - gHistoryMaxViewers);
+  PRInt32 endIndex = NS_MIN(mLength - 1,
                             mIndex + gHistoryMaxViewers);
   nsCOMPtr<nsISHTransaction> trans;
   GetTransactionAtIndex(startIndex, getter_AddRefs(trans));
diff --git a/dom/plugins/PluginModuleParent.cpp b/dom/plugins/PluginModuleParent.cpp
index 46e4c6915198..c02765e1f8f3 100644
--- a/dom/plugins/PluginModuleParent.cpp
+++ b/dom/plugins/PluginModuleParent.cpp
@@ -50,6 +50,24 @@ using namespace mozilla::plugins;
 
 PR_STATIC_ASSERT(sizeof(NPIdentifier) == sizeof(void*));
 
+class PluginCrashed : public nsRunnable
+{
+public:
+    PluginCrashed(nsNPAPIPlugin* plugin,
+                  const nsString& dumpID)
+        : mDumpID(dumpID),
+          mPlugin(plugin) { }
+
+    NS_IMETHOD Run() {
+        mPlugin->PluginCrashed(mDumpID);
+        return NS_OK;
+    }
+
+private:
+    nsNPAPIPlugin* mPlugin;
+    nsString mDumpID;
+};
+
 // static
 PluginLibrary*
 PluginModuleParent::LoadModule(const char* aFilePath)
@@ -160,8 +178,13 @@ PluginModuleParent::ActorDestroy(ActorDestroyReason why)
     switch (why) {
     case AbnormalShutdown: {
         nsCOMPtr<nsIFile> dump;
+        nsAutoString dumpID;
         if (GetMinidump(getter_AddRefs(dump))) {
             WriteExtraDataForMinidump(dump);
+            if (NS_SUCCEEDED(dump->GetLeafName(dumpID))) {
+                dumpID.Replace(dumpID.Length() - 4, 4,
+                               NS_LITERAL_STRING(""));
+            }
         }
         else {
             NS_WARNING("[PluginModuleParent::ActorDestroy] abnormal shutdown without minidump!");
@@ -172,8 +195,7 @@ PluginModuleParent::ActorDestroy(ActorDestroyReason why)
         // and potentially modify the actor child list while enumerating it.
         if (mPlugin) {
             nsCOMPtr<nsIRunnable> r =
-                new nsRunnableMethod<nsNPAPIPlugin>(
-                    mPlugin, &nsNPAPIPlugin::PluginCrashed);
+                new PluginCrashed(mPlugin, dumpID);
             NS_DispatchToMainThread(r);
         }
         break;
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index 86a0585ea5a7..925c494ddf71 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -92,8 +92,7 @@ ifdef HAVE_ARM_SIMD
 USE_ARM_SIMD_GCC=1
 endif
 ifdef HAVE_ARM_NEON
-# temporarily disabled to see if it fixes odd mobile build breakage
-#USE_ARM_NEON_GCC=1
+USE_ARM_NEON_GCC=1
 endif
 endif
 
@@ -148,6 +147,7 @@ endif
 
 ifdef USE_ARM_NEON_GCC
 CSRCS += pixman-arm-neon.c
+SSRCS += pixman-arm-neon-asm.S
 DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfloat-abi=softfp -mfpu=neon
 endif
diff --git a/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S b/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S
index 29868844235e..40c8ec4a9603 100644
--- a/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S
+++ b/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S
@@ -817,8 +817,8 @@ generate_composite_function \
     vsli.u64    d0, d0, #8
     vsli.u64    d0, d0, #16
     vsli.u64    d0, d0, #32
-    vmov        d1, d0
-    vmov        q1, q0
+    vorr        d1, d0, d0
+    vorr        q1, q0, q0
 .endm
 
 .macro pixman_composite_src_n_8_cleanup
@@ -856,8 +856,8 @@ generate_composite_function \
     vld1.32     {d0[0]}, [DUMMY]
     vsli.u64    d0, d0, #16
     vsli.u64    d0, d0, #32
-    vmov        d1, d0
-    vmov        q1, q0
+    vorr        d1, d0, d0
+    vorr        q1, q0, q0
 .endm
 
 .macro pixman_composite_src_n_0565_cleanup
@@ -894,8 +894,8 @@ generate_composite_function \
     add         DUMMY, sp, #ARGS_STACK_OFFSET
     vld1.32     {d0[0]}, [DUMMY]
     vsli.u64    d0, d0, #32
-    vmov        d1, d0
-    vmov        q1, q0
+    vorr        d1, d0, d0
+    vorr        q1, q0, q0
 .endm
 
 .macro pixman_composite_src_n_8888_cleanup
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 002650776f61..c6b6d742af41 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -380,6 +380,7 @@ _OBJS			= \
 	$(JRI_STUB_CFILES) \
 	$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
 	$(CSRCS:.c=.$(OBJ_SUFFIX)) \
+	$(SSRCS:.S=.$(OBJ_SUFFIX)) \
 	$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
 	$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
 	$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index 890ead5340bc..d695f52f1297 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -1009,12 +1009,10 @@ hunspell.hxx
 #if MOZ_NATIVE_BZ2==1
 bzlib.h
 #endif
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
 hildon-uri.h
 hildon-mime.h
 hildon-file-chooser-dialog.h
-#endif
-#ifdef NS_OSSO
 libosso.h
 osso-mem.h
 #endif
diff --git a/js/src/configure.in b/js/src/configure.in
index 300fbfc31c7f..4e6780218310 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -358,28 +358,28 @@ else
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(WINDRES, windres, :)
     if test -z "$HOST_CC"; then
-        HOST_CC="$CC"
+        HOST_CC='$(CC)'
     fi
     if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS="$CFLAGS"
+        HOST_CFLAGS='$(CFLAGS)'
     fi
     if test -z "$HOST_CXX"; then
-        HOST_CXX="$CXX"
+        HOST_CXX='$(CXX)'
     fi
     if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS="$CXXFLAGS"
+        HOST_CXXFLAGS='$(CXXFLAGS)'
     fi
     if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS="$LDFLAGS"
+        HOST_LDFLAGS='$(LDFLAGS)'
     fi
     if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB="$RANLIB"
+        HOST_RANLIB='$(RANLIB)'
     fi
     if test -z "$HOST_AR"; then
-        HOST_AR="$AR"
+        HOST_AR='$(AR)'
     fi
     if test -z "$HOST_AR_FLAGS"; then
-        HOST_AR_FLAGS="$AR_FLAGS"
+        HOST_AR_FLAGS='$(AR_FLAGS)'
     fi
 fi
 
@@ -1508,8 +1508,8 @@ case "$host" in
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-    MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
-    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+    LDFLAGS="$LDFLAGS -lobjc"
+    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
     ;;
 
 *-linux*|*-kfreebsd*-gnu)
@@ -1677,6 +1677,7 @@ case "$target" in
         
         LDFLAGS=$_SAVE_LDFLAGS
     fi
+    MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
     ;;
 
 *-freebsd*)
diff --git a/js/src/xpconnect/loader/XPCOMUtils.jsm b/js/src/xpconnect/loader/XPCOMUtils.jsm
index ac94054c42b0..2d5467e1acfc 100644
--- a/js/src/xpconnect/loader/XPCOMUtils.jsm
+++ b/js/src/xpconnect/loader/XPCOMUtils.jsm
@@ -281,6 +281,28 @@ var XPCOMUtils = {
            .getService(Ci.nsICategoryManager);
   },
 
+  /**
+   * Helper which iterates over a nsISimpleEnumerator.
+   * @param e The nsISimpleEnumerator to iterate over.
+   * @param i The expected interface for each element.
+   */
+  IterSimpleEnumerator: function XPCU_IterSimpleEnumerator(e, i)
+  {
+    while (e.hasMoreElements())
+      yield e.getNext().QueryInterface(i);
+  },
+
+  /**
+   * Helper which iterates over a string enumerator.
+   * @param e The string enumerator (nsIUTF8StringEnumerator or
+   *          nsIStringEnumerator) over which to iterate.
+   */
+  IterStringEnumerator: function XPCU_IterStringEnumerator(e)
+  {
+    while (e.hasMore())
+      yield e.getNext();
+  },
+
   /**
    * Returns an nsIFactory for |component|.
    */
@@ -314,3 +336,4 @@ function makeQI(interfaceNames) {
     throw Cr.NS_ERROR_NO_INTERFACE;
   };
 }
+
diff --git a/js/src/xpconnect/src/xpcwrappednativescope.cpp b/js/src/xpconnect/src/xpcwrappednativescope.cpp
index 4fac6144fb02..ab5761b3b2ae 100644
--- a/js/src/xpconnect/src/xpcwrappednativescope.cpp
+++ b/js/src/xpconnect/src/xpcwrappednativescope.cpp
@@ -780,11 +780,7 @@ void DEBUG_CheckForComponentsInScope(JSContext* cx, JSObject* obj,
     // global properties of that document's window are *gone*. Generally this
     // indicates a problem that should be addressed in the design and use of the
     // callback code.
-#ifdef I_FOOLISHLY_WANT_TO_IGNORE_THIS_LIKE_THE_OTHER_CRAP_WE_PRINTF
-    NS_WARNING("XPConnect is being called on a scope without a 'Components' property!");
-#else
     NS_ERROR("XPConnect is being called on a scope without a 'Components' property!");
-#endif
 }
 #else
 #define DEBUG_CheckForComponentsInScope(ccx, obj, OKIfNotInitialized, runtime) \
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 32d0e2a7827e..321dcf7601ce 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -77,8 +77,6 @@
 #include "nsIComboboxControlFrame.h"
 #include "nsIListControlFrame.h"
 #include "nsISelectControlFrame.h"
-#include "nsIRadioControlFrame.h"
-#include "nsICheckboxControlFrame.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsPlaceholderFrame.h"
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index e7b4cf91b772..228b7395cc14 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -58,8 +58,6 @@ EXPORTS		= \
 		nsIListControlFrame.h \
 		nsIComboboxControlFrame.h \
 		nsIFormControlFrame.h \
-		nsIRadioControlFrame.h \
-		nsICheckboxControlFrame.h \
 		nsISelectControlFrame.h \
 		nsITextControlFrame.h \
 		$(NULL)
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index cc02e48bcd06..a2247e586af6 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -119,11 +119,6 @@ nsGfxCheckboxControlFrame::~nsGfxCheckboxControlFrame()
 {
 }
 
-
-NS_QUERYFRAME_HEAD(nsGfxCheckboxControlFrame)
-  NS_QUERYFRAME_ENTRY(nsICheckboxControlFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsFormControlFrame)
-
 #ifdef ACCESSIBILITY
 NS_IMETHODIMP
 nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessible)
@@ -140,15 +135,6 @@ nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessible)
 }
 #endif
 
-//------------------------------------------------------------
-NS_IMETHODIMP
-nsGfxCheckboxControlFrame::OnChecked(nsPresContext* aPresContext,
-                                     PRBool aChecked)
-{
-  InvalidateOverflowRect();
-  return NS_OK;
-}
-
 //------------------------------------------------------------
 NS_IMETHODIMP
 nsGfxCheckboxControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
diff --git a/layout/forms/nsGfxCheckboxControlFrame.h b/layout/forms/nsGfxCheckboxControlFrame.h
index 3cc8fb2b97cf..2727b5a8cad5 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.h
+++ b/layout/forms/nsGfxCheckboxControlFrame.h
@@ -38,14 +38,12 @@
 #define nsGfxCheckboxControlFrame_h___
 
 #include "nsFormControlFrame.h"
-#include "nsICheckboxControlFrame.h"
 
 #ifdef ACCESSIBILITY
 class nsIAccessible;
 #endif
 
-class nsGfxCheckboxControlFrame : public nsFormControlFrame,
-                                  public nsICheckboxControlFrame
+class nsGfxCheckboxControlFrame : public nsFormControlFrame
 {
 public:
   NS_DECL_FRAMEARENA_HELPERS
@@ -67,11 +65,6 @@ public:
   NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
 #endif
 
-  //nsICheckboxControlFrame methods
-  NS_IMETHOD OnChecked(nsPresContext* aPresContext, PRBool aChecked);
-
-  NS_DECL_QUERYFRAME
-
 protected:
 
   PRBool IsChecked();
diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp
index b80cf6da00bf..4cd0ea05afef 100644
--- a/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/layout/forms/nsGfxRadioControlFrame.cpp
@@ -64,10 +64,6 @@ nsGfxRadioControlFrame::~nsGfxRadioControlFrame()
 {
 }
 
-NS_QUERYFRAME_HEAD(nsGfxRadioControlFrame)
-  NS_QUERYFRAME_ENTRY(nsIRadioControlFrame)
-NS_QUERYFRAME_TAIL_INHERITING(nsFormControlFrame)
-
 #ifdef ACCESSIBILITY
 NS_IMETHODIMP
 nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible)
@@ -126,11 +122,3 @@ nsGfxRadioControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   return aLists.Content()->AppendNewToTop(new (aBuilder)
     nsDisplayGeneric(this, PaintCheckedRadioButton, "CheckedRadioButton"));
 }
-
-NS_IMETHODIMP
-nsGfxRadioControlFrame::OnChecked(nsPresContext* aPresContext,
-                                  PRBool aChecked)
-{
-  InvalidateOverflowRect();
-  return NS_OK;
-}
diff --git a/layout/forms/nsGfxRadioControlFrame.h b/layout/forms/nsGfxRadioControlFrame.h
index 52a46d31bf21..011131ef11e5 100644
--- a/layout/forms/nsGfxRadioControlFrame.h
+++ b/layout/forms/nsGfxRadioControlFrame.h
@@ -39,7 +39,6 @@
 #define nsGfxRadioControlFrame_h___
 
 #include "nsFormControlFrame.h"
-#include "nsIRadioControlFrame.h"
 
 #ifdef ACCESSIBILITY
 class nsIAccessible;
@@ -47,21 +46,17 @@ class nsIAccessible;
 
 // nsGfxRadioControlFrame
 
-class nsGfxRadioControlFrame : public nsFormControlFrame,
-                               public nsIRadioControlFrame
-
+class nsGfxRadioControlFrame : public nsFormControlFrame
 {
 public:
   nsGfxRadioControlFrame(nsStyleContext* aContext);
   ~nsGfxRadioControlFrame();
 
-  NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS
 
 #ifdef ACCESSIBILITY
   NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
 #endif
-  NS_IMETHOD OnChecked(nsPresContext* aPresContext, PRBool aChecked);
 
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                               const nsRect&           aDirtyRect,
diff --git a/layout/forms/nsICheckboxControlFrame.h b/layout/forms/nsICheckboxControlFrame.h
deleted file mode 100644
index da9e26c00ae8..000000000000
--- a/layout/forms/nsICheckboxControlFrame.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsICheckControlFrame_h___
-#define nsICheckControlFrame_h___
-
-#include "nsQueryFrame.h"
-class nsStyleContext;
-class nsPresContext;
-
-/** 
-  * nsICheckControlFrame is the common interface radio buttons.
-  * @see nsFromControlFrame and its base classes for more info
-  */
-class nsICheckboxControlFrame
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsICheckboxControlFrame)
-  
-  /**
-   * Called by content when checkbox "checked" changes
-   */
-  NS_IMETHOD OnChecked(nsPresContext* aPresContext, PRBool aChecked) = 0;
-};
-
-#endif
-
diff --git a/layout/forms/nsIRadioControlFrame.h b/layout/forms/nsIRadioControlFrame.h
deleted file mode 100644
index ee22d7e35d72..000000000000
--- a/layout/forms/nsIRadioControlFrame.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIRadioControlFrame_h___
-#define nsIRadioControlFrame_h___
-
-#include "nsQueryFrame.h"
-class nsStyleContext;
-
-/** 
-  * nsIRadioControlFrame is the common interface radio buttons.
-  * @see nsFormControlFrame and its base classes for more info
-  */
-class nsIRadioControlFrame
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsIRadioControlFrame)
-
-   /**
-    * Called by content when the radio button's state changes
-    */
-   NS_IMETHOD OnChecked(nsPresContext* aPresContext, PRBool aChecked) = 0;
-};
-
-#endif
-
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index f1e97ef57537..dcee78aade22 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -173,7 +173,7 @@ enum { XKeyPress = KeyPress };
 #undef KeyPress
 #endif
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 #define MOZ_COMPOSITED_PLUGINS 1
 
 #include "gfxXlibSurface.h"
@@ -416,7 +416,7 @@ public:
     return strncmp(GetPluginName(), aPluginName, strlen(aPluginName)) == 0;
   }
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   nsresult SetAbsoluteScreenPosition(nsIDOMElement* element,
                                      nsIDOMClientRect* position,
                                      nsIDOMClientRect* clip);
@@ -511,7 +511,7 @@ private:
   };
 #endif
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 
   // On hildon, we attempt to use NPImageExpose which allows us faster
   // painting.
@@ -1225,7 +1225,7 @@ nsObjectFrame::SetAbsoluteScreenPosition(nsIDOMElement* element,
                                          nsIDOMClientRect* position,
                                          nsIDOMClientRect* clip)
 {
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   if (!mInstanceOwner)
     return NS_ERROR_NOT_AVAILABLE;
   return mInstanceOwner->SetAbsoluteScreenPosition(element, position, clip);
@@ -2137,7 +2137,7 @@ GetMIMEType(nsIPluginInstance *aPluginInstance)
 static PRBool
 DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
 {
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO==5)
   // Don't delay stop on Maemo/Hildon (bug 530739).
   if (aDelayedStop && aInstanceOwner->MatchPluginName("Shockwave Flash"))
     return PR_FALSE;
@@ -2455,7 +2455,7 @@ nsPluginInstanceOwner::nsPluginInstanceOwner()
   mLastPoint = nsIntPoint(0,0);
 #endif
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   mPluginSize = nsIntSize(0,0);
   mXlibSurfGC = None;
   mBlitWindow = nsnull;
@@ -2525,7 +2525,7 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
     mInstance->InvalidateOwner();
   }
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   ReleaseXShm();
 #endif
 }
@@ -2737,7 +2737,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::InvalidateRect(NPRect *invalidRect)
   if (!mObjectFrame || !invalidRect || !mWidgetVisible)
     return NS_ERROR_FAILURE;
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   PRBool simpleImageRender = PR_FALSE;
   mInstance->GetValueFromPlugin(NPPVpluginWindowlessLocalBool,
                                 &simpleImageRender);
@@ -4871,7 +4871,7 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
   if (!mInstance || !mObjectFrame)
     return;
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
   // through to be able to paint the context passed in.  This allows
   // us to handle plugins that do not self invalidate (slowly, but
   // accurately), and it allows us to reduce flicker.
@@ -4960,7 +4960,7 @@ DepthOfVisual(const Screen* screen, const Visual* visual)
 }
 #endif
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 
 static GdkWindow* GetClosestWindow(nsIDOMElement *element)
 {
@@ -5651,7 +5651,7 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost)
   mPluginHost = aHost;
 }
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 PRBool nsPluginInstanceOwner::UpdateVisibility(PRBool aVisible)
 {
   // NOTE: Death grip must be held by caller.
@@ -5815,7 +5815,7 @@ void nsPluginInstanceOwner::FixUpURLS(const nsString &name, nsAString &value)
   }
 }
 
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 nsresult
 nsPluginInstanceOwner::SetAbsoluteScreenPosition(nsIDOMElement* element,
                                                  nsIDOMClientRect* position,
diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h
index b3d5322a6222..8fb853eec66e 100644
--- a/layout/generic/nsQueryFrame.h
+++ b/layout/generic/nsQueryFrame.h
@@ -111,7 +111,6 @@ public:
     nsHTMLScrollFrame_id,
     nsIAnonymousContentCreator_id,
     nsICSSPseudoComparator_id,
-    nsICheckboxControlFrame_id,
     nsIComboboxControlFrame_id,
     nsIFormControlFrame_id,
     nsIFrame_id,
@@ -123,7 +122,6 @@ public:
     nsIObjectFrame_id,
     nsIPageSequenceFrame_id,
     nsIPercentHeightObserver_id,
-    nsIRadioControlFrame_id,
     nsIRootBox_id,
     nsISVGChildFrame_id,
     nsISVGGlyphFragmentLeaf_id,
diff --git a/layout/style/nsCSSPseudoClassList.h b/layout/style/nsCSSPseudoClassList.h
index ac2c834849b0..3c2da8e678a1 100644
--- a/layout/style/nsCSSPseudoClassList.h
+++ b/layout/style/nsCSSPseudoClassList.h
@@ -114,6 +114,8 @@ CSS_STATE_PSEUDO_CLASS(mozHandlerDisabled, ":-moz-handler-disabled",
                        NS_EVENT_STATE_HANDLER_DISABLED)
 CSS_STATE_PSEUDO_CLASS(mozHandlerBlocked, ":-moz-handler-blocked",
                        NS_EVENT_STATE_HANDLER_BLOCKED)
+CSS_STATE_PSEUDO_CLASS(mozHandlerCrashed, ":-moz-handler-crashed",
+                       NS_EVENT_STATE_HANDLER_CRASHED)
 
 CSS_PSEUDO_CLASS(mozHasHandlerRef, ":-moz-has-handlerref")
 
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index f79a1aabb82b..7e92d1ae458e 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -704,6 +704,13 @@ function run() {
     test_balanced_unparseable(":-moz-tree-twisty(open())");
     test_balanced_unparseable("::-moz-tree-twisty(hover ())");
 
+    // Plugin pseudoclasses
+    test_parseable(":-moz-type-unsupported");
+    test_parseable(":-moz-handler-disabled");
+    test_parseable(":-moz-handler-blocked");
+    test_parseable(":-moz-handler-crashed");
+    test_parseable(":-moz-has-handlerref");
+
     // Case sensitivity of tag selectors
     function setup_cased_spans(body) {
       var data = [
diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in
index aef5287e3c4d..d1013d73f783 100644
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -68,9 +68,11 @@ ifeq ($(OS_ARCH),OS2)
 TOOL_DIRS += default/os2
 endif
 
+ifdef PBBUILD
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 TOOL_DIRS += default/mac
 endif
+endif
 
 ifdef ENABLE_TESTS
 ifneq (,$(filter WINNT Darwin Linux OS2 SunOS,$(OS_ARCH)))
diff --git a/modules/plugin/base/public/npapi.h b/modules/plugin/base/public/npapi.h
index b8e943d54eb8..9622b7a9fc04 100644
--- a/modules/plugin/base/public/npapi.h
+++ b/modules/plugin/base/public/npapi.h
@@ -338,7 +338,7 @@ typedef enum {
   , NPPVpluginEventModel = 1001
 #endif
 
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
   , NPPVpluginWindowlessLocalBool = 2002
 #endif
 } NPPVariable;
@@ -383,7 +383,7 @@ typedef enum {
 #endif
   , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
 #endif
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
   , NPNVSupportsWindowlessLocal = 2002
 #endif
 } NPNVariable;
diff --git a/modules/plugin/base/public/nsPluginNativeWindow.h b/modules/plugin/base/public/nsPluginNativeWindow.h
index f85c9a00f239..c4e8e55059ce 100644
--- a/modules/plugin/base/public/nsPluginNativeWindow.h
+++ b/modules/plugin/base/public/nsPluginNativeWindow.h
@@ -103,7 +103,7 @@ public:
     SetPluginInstance(aPluginInstance);
     return NS_OK;
   }
-#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
+#if (MOZ_PLATFORM_MAEMO == 5)
 #define MOZ_COMPOSITED_PLUGINS
 #endif
 #ifdef MOZ_COMPOSITED_PLUGINS
diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp
index 1133a769467e..1482cd2dceb4 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -300,10 +300,10 @@ nsNPAPIPlugin::SetPluginRefNum(short aRefNum)
 
 #ifdef MOZ_IPC
 void
-nsNPAPIPlugin::PluginCrashed()
+nsNPAPIPlugin::PluginCrashed(const nsAString& dumpID)
 {
   nsRefPtr<nsPluginHost> host = dont_AddRef(nsPluginHost::GetInst());
-  host->PluginCrashed(this);
+  host->PluginCrashed(this, dumpID);
 }
 #endif
 
@@ -2139,7 +2139,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
     return NPERR_GENERIC_ERROR;
   }
 
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
   case NPNVSupportsWindowlessLocal: {
     *(NPBool*)result = PR_TRUE;
     return NPERR_NO_ERROR;
@@ -2277,7 +2277,7 @@ _setvalue(NPP npp, NPPVariable variable, void *result)
       return inst->SetWindowless(bWindowless);
 #endif
     }
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
     case NPPVpluginWindowlessLocalBool: {
       NPBool bWindowlessLocal = (result != nsnull);
       return inst->SetWindowlessLocal(bWindowlessLocal);
diff --git a/modules/plugin/base/src/nsNPAPIPlugin.h b/modules/plugin/base/src/nsNPAPIPlugin.h
index 9671cbd7fd36..0d1fa83f5a9a 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.h
+++ b/modules/plugin/base/src/nsNPAPIPlugin.h
@@ -93,8 +93,9 @@ public:
 
 #ifdef MOZ_IPC
   // The IPC mechanism notifies the nsNPAPIPlugin if the plugin crashes and is
-  // no longer usable.
-  void PluginCrashed();
+  // no longer usable. dumpID is the ID of a minidump that was written,
+  // or empty if no minidump was written.
+  void PluginCrashed(const nsAString& dumpID);
 #endif
 
 protected:
diff --git a/modules/plugin/base/src/nsNPAPIPluginInstance.cpp b/modules/plugin/base/src/nsNPAPIPluginInstance.cpp
index 32cfbf86ba11..b2110eb5b41d 100644
--- a/modules/plugin/base/src/nsNPAPIPluginInstance.cpp
+++ b/modules/plugin/base/src/nsNPAPIPluginInstance.cpp
@@ -1392,7 +1392,7 @@ NS_IMETHODIMP nsNPAPIPluginInstance::HandleEvent(void* event, PRBool* handled)
 
 NS_IMETHODIMP nsNPAPIPluginInstance::GetValueFromPlugin(NPPVariable variable, void* value)
 {
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
   // The maemo flash plugin does not remember this.  It sets the
   // value, but doesn't support the get value.
   if (variable == NPPVpluginWindowlessLocalBool) {
diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp
index 72c9fb62de67..de3604687114 100644
--- a/modules/plugin/base/src/nsPluginHost.cpp
+++ b/modules/plugin/base/src/nsPluginHost.cpp
@@ -89,6 +89,7 @@
 #include "nsVersionComparator.h"
 #include "nsIPrivateBrowsingService.h"
 #include "nsIObjectLoadingContent.h"
+#include "nsIWritablePropertyBag2.h"
 
 #include "nsEnumeratorUtils.h"
 #include "nsXPCOM.h"
@@ -5207,7 +5208,7 @@ NS_IMETHODIMP nsPluginHost::Notify(nsITimer* timer)
 
 #ifdef MOZ_IPC
 void
-nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin)
+nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin, const nsAString& dumpID)
 {
   nsPluginTag* pluginTag = FindTagForPlugin(aPlugin);
   if (!pluginTag) {
@@ -5215,6 +5216,17 @@ nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin)
     return;
   }
 
+  // Notify the app's observer that a plugin crashed so it can submit a crashreport.
+  PRBool submittedCrashReport = PR_FALSE;
+  nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
+  nsCOMPtr<nsIWritablePropertyBag2> propbag = do_CreateInstance("@mozilla.org/hash-property-bag;1");
+  if (obsService && propbag) {
+    propbag->SetPropertyAsAString(NS_LITERAL_STRING("minidumpID"), dumpID);
+    obsService->NotifyObservers(propbag, "plugin-crashed", nsnull);
+    // see if an observer submitted a crash report.
+    propbag->GetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"), &submittedCrashReport);
+  }
+
   // Invalidate each nsPluginInstanceTag for the crashed plugin
 
   for (PRUint32 i = mInstanceTags.Length(); i > 0; i--) {
@@ -5225,7 +5237,8 @@ nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin)
       instanceTag->mInstance->GetDOMElement(getter_AddRefs(domElement));
       nsCOMPtr<nsIObjectLoadingContent> objectContent(do_QueryInterface(domElement));
       if (objectContent) {
-        objectContent->PluginCrashed();
+        objectContent->PluginCrashed(NS_ConvertUTF8toUTF16(pluginTag->mName),
+                                     submittedCrashReport);
       }
       
       instanceTag->mInstance->Stop();
diff --git a/modules/plugin/base/src/nsPluginHost.h b/modules/plugin/base/src/nsPluginHost.h
index d187d665ab8f..1a3cf951d93e 100644
--- a/modules/plugin/base/src/nsPluginHost.h
+++ b/modules/plugin/base/src/nsPluginHost.h
@@ -160,7 +160,7 @@ public:
   void RemoveIdleTimeTarget(nsIPluginInstanceOwner* objectFrame);
 
 #ifdef MOZ_IPC
-  void PluginCrashed(nsNPAPIPlugin* plugin);
+  void PluginCrashed(nsNPAPIPlugin* plugin, const nsAString& dumpID);
 #endif
 
   nsPluginInstanceTag *FindInstanceTag(nsIPluginInstance *instance);
diff --git a/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp b/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
index a86366a6fc82..a6fa4d66d0dc 100644
--- a/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+++ b/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
@@ -49,7 +49,7 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
 
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
 #define MOZ_COMPOSITED_PLUGINS
 #endif
 
diff --git a/modules/plugin/test/mochitest/Makefile.in b/modules/plugin/test/mochitest/Makefile.in
index 5ac19f15e1a9..4c11e61d5f17 100644
--- a/modules/plugin/test/mochitest/Makefile.in
+++ b/modules/plugin/test/mochitest/Makefile.in
@@ -45,68 +45,69 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _MOCHITEST_FILES = \
-		test_getauthenticationinfo.html \
-		test_npobject_getters.html \
-		test_npruntime_npnevaluate.html \
-		test_npruntime_npninvoke.html \
-		test_npruntime_npninvokedefault.html \
-		loremipsum.txt \
-		loremipsum_file.txt \
-		post.sjs \
-		pluginstream.js \
-		plugin_window.html \
-		test_painting.html \
-		test_pluginstream_err.html \
-		test_pluginstream_src.html \
-		test_pluginstream_geturl.html \
-		test_pluginstream_geturlnotify.html \
-		test_pluginstream_asfile.html \
-		test_pluginstream_asfileonly.html \
-		test_pluginstream_post.html \
-		test_pluginstream_poststream.html \
-		test_pluginstream_seek.html \
-		test_pluginstream_newstream.html \
-		test_multipleinstanceobjects.html \
-		test_streamNotify.html \
-		test_instantiation.html \
-		test_cookies.html \
-		test_npn_timers.html \
-		test_npn_asynccall.html \
-		$(NULL)
+  test_getauthenticationinfo.html \
+  test_npobject_getters.html \
+  test_npruntime_npnevaluate.html \
+  test_npruntime_npninvoke.html \
+  test_npruntime_npninvokedefault.html \
+  loremipsum.txt \
+  loremipsum_file.txt \
+  post.sjs \
+  pluginstream.js \
+  plugin_window.html \
+  test_painting.html \
+  test_pluginstream_err.html \
+  test_pluginstream_src.html \
+  test_pluginstream_geturl.html \
+  test_pluginstream_geturlnotify.html \
+  test_pluginstream_asfile.html \
+  test_pluginstream_asfileonly.html \
+  test_pluginstream_post.html \
+  test_pluginstream_poststream.html \
+  test_pluginstream_seek.html \
+  test_pluginstream_newstream.html \
+  test_multipleinstanceobjects.html \
+  test_streamNotify.html \
+  test_instantiation.html \
+  test_cookies.html \
+  test_npn_timers.html \
+  test_npn_asynccall.html \
+  $(NULL)
 
-#		test_npruntime_npnsetexception.html \ Disabled for e10s
+#  test_npruntime_npnsetexception.html \ Disabled for e10s
 
 ifdef MOZ_IPC
 _MOCHITEST_FILES += \
-		test_crashing.html \
-		test_crashing2.html \
-		crashing_subpage.html \
-		$(NULL)
+  test_crashing.html \
+  test_crashing2.html \
+  crashing_subpage.html \
+  $(NULL)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 _MOCHITEST_FILES += \
- 		test_windowed_invalidate.html \
-        $(NULL)
+  test_windowed_invalidate.html \
+  $(NULL)
 endif
 
 _MOCHICHROME_FILES = \
-		test_bug479979.xul \
-		test_npruntime.xul   \
-		test_privatemode.xul \
-		test_wmode.xul \
-		$(NULL)
+  test_bug479979.xul \
+  test_npruntime.xul   \
+  test_privatemode.xul \
+  test_wmode.xul \
+  $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 _MOCHICHROME_FILES += \
-		test_convertpoint.xul \
-		$(NULL)
+  test_convertpoint.xul \
+  $(NULL)
 endif
 
 ifdef MOZ_IPC
 _MOCHICHROME_FILES += \
-		test_crash_notify.xul \
-		$(NULL)
+  test_crash_notify.xul \
+  test_crash_notify_no_report.xul \
+  $(NULL)
 endif
 
 libs:: $(_MOCHICHROME_FILES)
diff --git a/modules/plugin/test/mochitest/test_crash_notify.xul b/modules/plugin/test/mochitest/test_crash_notify.xul
index 68e1238d8e82..4106a840f279 100644
--- a/modules/plugin/test/mochitest/test_crash_notify.xul
+++ b/modules/plugin/test/mochitest/test_crash_notify.xul
@@ -19,12 +19,71 @@ SimpleTest.waitForExplicitFinish();
 
 var success = false;
 
+var observerFired = false;
+
+var testObserver = {
+  observe: function(subject, topic, data) {
+    observerFired = true;
+    ok(true, "Observer fired");
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    is(topic, "plugin-crashed", "Checking correct topic");
+    is(data,  null, "Checking null data");
+    ok((subject instanceof Components.interfaces.nsIPropertyBag2), "got Propbag");
+    ok((subject instanceof Components.interfaces.nsIWritablePropertyBag2),
+"got writable Propbag");
+
+    var id = subject.getPropertyAsAString("minidumpID");
+    isnot(id, "", "got a non-empty crash id");
+    let directoryService =
+      Components.classes["@mozilla.org/file/directory_service;1"].
+      getService(Components.interfaces.nsIProperties);
+    let profD = directoryService.get("ProfD", Components.interfaces.nsIFile);
+    profD.append("minidumps");
+    let dumpFile = profD.clone();
+    dumpFile.append(id + ".dmp");
+    ok(dumpFile.exists(), "minidump exists");
+    let extraFile = profD.clone();
+    extraFile.append(id + ".extra");
+    ok(extraFile.exists(), "extra file exists");
+    // cleanup, to be nice
+    dumpFile.remove(false);
+    extraFile.remove(false);
+  },
+
+  QueryInterface: function(iid) {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    if (iid.equals(Components.interfaces.nsIObserver) ||
+        iid.equals(Components.interfaces.nsISupportsWeakReference) ||
+        iid.equals(Components.interfaces.nsISupports))
+      return this;
+    throw Components.results.NS_NOINTERFACE;
+  }
+};
+
+
 function onPluginCrashed(aEvent) {
   ok(true, "Plugin crashed notification received");
+  ok(observerFired, "Observer should have fired first");
+  is(aEvent.type, "PluginCrashed", "event is correct type");
 
   var pluginElement = document.getElementById("plugin1");
   is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
 
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  
+  ok(aEvent instanceof Components.interfaces.nsIDOMDataContainerEvent,
+     "plugin crashed event has the right interface");
+  var pluginName = aEvent.getData("pluginName");
+  is(pluginName, "Test Plug-in");
+  var didReport = aEvent.getData("submittedCrashReport");
+  // The app itself may or may not have decided to submit the report, so
+  // allow either true or false here.
+  ok((didReport == true || didReport == false), "event said crash report was submitted");
+
+  var os = Components.classes["@mozilla.org/observer-service;1"].
+           getService(Components.interfaces.nsIObserverService);
+  os.removeObserver(testObserver, "plugin-crashed");
+
   SimpleTest.finish();
 }
 
@@ -38,6 +97,10 @@ function runTests() {
     return;
   }
 
+  var os = Components.classes["@mozilla.org/observer-service;1"].
+           getService(Components.interfaces.nsIObserverService);
+  os.addObserver(testObserver, "plugin-crashed", true);
+  
   document.addEventListener("PluginCrashed", onPluginCrashed, false);
 
   var pluginElement = document.getElementById("plugin1");
diff --git a/modules/plugin/test/mochitest/test_crash_notify_no_report.xul b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul
new file mode 100644
index 000000000000..18fde80ead3b
--- /dev/null
+++ b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+<window title="Basic Plugin Tests"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <title>Plugin Crash Notification Test</title>
+  <script type="application/javascript" 
+   src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
+<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
+</body>
+<script class="testbody" type="application/javascript">
+<![CDATA[
+SimpleTest.waitForExplicitFinish();
+
+var success = false;
+
+var observerFired = false;
+
+var testObserver = {
+  observe: function(subject, topic, data) {
+    observerFired = true;
+    ok(true, "Observer fired");
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    is(topic, "plugin-crashed", "Checking correct topic");
+    is(data,  null, "Checking null data");
+    ok((subject instanceof Components.interfaces.nsIPropertyBag2), "got Propbag");
+    ok((subject instanceof Components.interfaces.nsIWritablePropertyBag2),
+"got writable Propbag");
+
+    var id = subject.getPropertyAsAString("minidumpID");
+    isnot(id, "", "got a non-empty crash id");
+    let directoryService =
+      Components.classes["@mozilla.org/file/directory_service;1"].
+      getService(Components.interfaces.nsIProperties);
+    let pendingD = directoryService.get("UAppData",
+                                        Components.interfaces.nsIFile);
+    pendingD.append("Crash Reports");
+    pendingD.append("pending");
+    let dumpFile = pendingD.clone();    
+    dumpFile.append(id + ".dmp");
+    ok(dumpFile.exists(), "minidump exists");
+    let extraFile = pendingD.clone();
+    extraFile.append(id + ".extra");
+    ok(extraFile.exists(), "extra file exists");
+    // cleanup, to be nice
+    dumpFile.remove(false);
+    extraFile.remove(false);
+  },
+
+  QueryInterface: function(iid) {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    if (iid.equals(Components.interfaces.nsIObserver) ||
+        iid.equals(Components.interfaces.nsISupportsWeakReference) ||
+        iid.equals(Components.interfaces.nsISupports))
+      return this;
+    throw Components.results.NS_NOINTERFACE;
+  }
+};
+
+
+function onPluginCrashed(aEvent) {
+  ok(true, "Plugin crashed notification received");
+  ok(observerFired, "Observer should have fired first");
+  is(aEvent.type, "PluginCrashed", "event is correct type");
+
+  var pluginElement = document.getElementById("plugin1");
+  is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
+
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  
+  ok(aEvent instanceof Components.interfaces.nsIDOMDataContainerEvent,
+     "plugin crashed event has the right interface");
+  var pluginName = aEvent.getData("pluginName");
+  is(pluginName, "Test Plug-in");
+  var didReport = aEvent.getData("submittedCrashReport");
+  // The app itself may or may not have decided to submit the report, so
+  // allow either true or false here.
+  ok((didReport == true || didReport == false), "event said crash report was submitted");
+
+  var os = Components.classes["@mozilla.org/observer-service;1"].
+           getService(Components.interfaces.nsIObserverService);
+  os.removeObserver(testObserver, "plugin-crashed");
+
+  // re-set MOZ_CRASHREPORTER_NO_REPORT
+  let env = Components.classes["@mozilla.org/process/environment;1"]
+                      .getService(Components.interfaces.nsIEnvironment);
+  env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
+  SimpleTest.finish();
+}
+
+function runTests() {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  var prefs = Components.classes['@mozilla.org/preferences-service;1']
+    .getService(Components.interfaces.nsIPrefBranch);
+  if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) {
+    ok(true, "Skipping this test when IPC plugins are not enabled.");
+    SimpleTest.finish();
+    return;
+  }
+  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
+  // ensure that we can change the setting and have our minidumps
+  // wind up in Crash Reports/pending
+  let env = Components.classes["@mozilla.org/process/environment;1"]
+                      .getService(Components.interfaces.nsIEnvironment);
+  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
+
+  var os = Components.classes["@mozilla.org/observer-service;1"].
+           getService(Components.interfaces.nsIObserverService);
+  os.addObserver(testObserver, "plugin-crashed", true);
+  
+  document.addEventListener("PluginCrashed", onPluginCrashed, false);
+
+  var pluginElement = document.getElementById("plugin1");
+  try {
+    pluginElement.crash();
+  } catch (e) {
+  }
+}
+]]>
+</script>
+</window>
+
diff --git a/netwerk/cookie/src/nsCookieService.cpp b/netwerk/cookie/src/nsCookieService.cpp
index 9492be6fba3b..83e95977c5b4 100644
--- a/netwerk/cookie/src/nsCookieService.cpp
+++ b/netwerk/cookie/src/nsCookieService.cpp
@@ -1727,11 +1727,7 @@ nsCookieService::AddInternal(const nsCString &aBaseDomain,
 
  ** Begin BNF:
     token         = 1*<any allowed-chars except separators>
-    value         = token-value | quoted-string
-    token-value   = 1*<any allowed-chars except value-sep>
-    quoted-string = ( <"> *( qdtext | quoted-pair ) <"> )
-    qdtext        = <any allowed-chars except <">>             ; CR | LF removed by necko
-    quoted-pair   = "\" <any OCTET except NUL or cookie-sep>   ; CR | LF removed by necko
+    value         = 1*<any allowed-chars except value-sep>
     separators    = ";" | "="
     value-sep     = ";"
     cookie-sep    = CR | LF
@@ -1766,7 +1762,6 @@ nsCookieService::AddInternal(const nsCString &aBaseDomain,
 // helper functions for GetTokenValue
 static inline PRBool iswhitespace     (char c) { return c == ' '  || c == '\t'; }
 static inline PRBool isterminator     (char c) { return c == '\n' || c == '\r'; }
-static inline PRBool isquoteterminator(char c) { return isterminator(c) || c == '"'; }
 static inline PRBool isvalueseparator (char c) { return isterminator(c) || c == ';'; }
 static inline PRBool istokenseparator (char c) { return isvalueseparator(c) || c == '='; }
 
@@ -1806,39 +1801,16 @@ nsCookieService::GetTokenValue(nsASingleFragmentCString::const_char_iterator &aI
 
     start = aIter;
 
-    if (*aIter == '"') {
-      // process <quoted-string>
-      // (note: cookie terminators, CR | LF, can't happen:
-      // they're removed by necko before the header gets here)
-      // assume value mangled if no terminating '"', return
-      while (++aIter != aEndIter && !isquoteterminator(*aIter)) {
-        // if <qdtext> (backwhacked char), skip over it. this allows '\"' in <quoted-string>.
-        // we increment once over the backwhack, nullcheck, then continue to the 'while',
-        // which increments over the backwhacked char. one exception - we don't allow
-        // CR | LF here either (see above about necko)
-        if (*aIter == '\\' && (++aIter == aEndIter || isterminator(*aIter)))
-          break;
-      }
+    // process <token>
+    // just look for ';' to terminate ('=' allowed)
+    while (aIter != aEndIter && !isvalueseparator(*aIter))
+      ++aIter;
 
-      if (aIter != aEndIter && !isterminator(*aIter)) {
-        // include terminating quote in attribute string
-        aTokenValue.Rebind(start, ++aIter);
-        // skip to next ';'
-        while (aIter != aEndIter && !isvalueseparator(*aIter))
-          ++aIter;
-      }
-    } else {
-      // process <token-value>
-      // just look for ';' to terminate ('=' allowed)
-      while (aIter != aEndIter && !isvalueseparator(*aIter))
-        ++aIter;
-
-      // remove trailing <LWS>; first check we're not at the beginning
-      if (aIter != start) {
-        lastSpace = aIter;
-        while (--lastSpace != start && iswhitespace(*lastSpace));
-        aTokenValue.Rebind(start, ++lastSpace);
-      }
+    // remove trailing <LWS>; first check we're not at the beginning
+    if (aIter != start) {
+      lastSpace = aIter;
+      while (--lastSpace != start && iswhitespace(*lastSpace));
+      aTokenValue.Rebind(start, ++lastSpace);
     }
   }
 
@@ -1900,10 +1872,6 @@ nsCookieService::ParseAttributes(nsDependentCString &aCookieHeader,
     if (!tokenValue.IsEmpty()) {
       tokenValue.BeginReading(tempBegin);
       tokenValue.EndReading(tempEnd);
-      if (*tempBegin == '"' && *--tempEnd == '"') {
-        // our parameter is a quoted-string; remove quotes for later parsing
-        tokenValue.Rebind(++tempBegin, tempEnd);
-      }
     }
 
     // decide which attribute we have, and copy the string
@@ -2272,8 +2240,15 @@ nsCookieService::GetExpiry(nsCookieAttributes &aCookieAttributes,
     PRTime tempExpires;
     PRInt64 expires;
 
+    // For Expires, we trim leading and trailing " characters to maximize
+    // the compatibility of our date parsing.  In principle, this processsing
+    // should be done in our date parser.
+    nsCString& expiresAttr = aCookieAttributes.expires;
+    if (!expiresAttr.IsEmpty() && expiresAttr.First() == '"' && expiresAttr.Last() == '"')
+      expiresAttr = Substring(expiresAttr.BeginReading() + 1, expiresAttr.EndReading() - 1);
+
     // parse expiry time
-    if (PR_ParseTimeString(aCookieAttributes.expires.get(), PR_TRUE, &tempExpires) == PR_SUCCESS) {
+    if (PR_ParseTimeString(expiresAttr.get(), PR_TRUE, &tempExpires) == PR_SUCCESS) {
       expires = tempExpires / PR_USEC_PER_SEC;
     } else {
       return PR_TRUE;
diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp
index f16438f66b75..525ad0e7ab6d 100644
--- a/netwerk/test/TestCookie.cpp
+++ b/netwerk/test/TestCookie.cpp
@@ -462,39 +462,45 @@ main(PRInt32 argc, char *argv[])
       SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; expires=Thu, 10 Apr 1980 16:33:12 GMT", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
       rv[2] = CheckResult(cookie.get(), MUST_BE_NULL);
-
-      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=60", nsnull);
+      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; expires=\"Thu, 10 Apr 1980 16:33:12 GMT", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
-      rv[3] = CheckResult(cookie.get(), MUST_EQUAL, "test=expiry");
-      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=-20", nsnull);
+      rv[3] = CheckResult(cookie.get(), MUST_BE_NULL);
+      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; expires=\"Thu, 10 Apr 1980 16:33:12 GMT\"", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
       rv[4] = CheckResult(cookie.get(), MUST_BE_NULL);
+
       SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=60", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
       rv[5] = CheckResult(cookie.get(), MUST_EQUAL, "test=expiry");
-      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; expires=Thu, 10 Apr 1980 16:33:12 GMT", nsnull);
+      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=-20", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
       rv[6] = CheckResult(cookie.get(), MUST_BE_NULL);
       SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=60", nsnull);
+      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
+      rv[7] = CheckResult(cookie.get(), MUST_EQUAL, "test=expiry");
+      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; expires=Thu, 10 Apr 1980 16:33:12 GMT", nsnull);
+      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
+      rv[8] = CheckResult(cookie.get(), MUST_BE_NULL);
+      SetACookie(cookieService, "http://expireme.org/", nsnull, "test=expiry; max-age=60", nsnull);
       SetACookie(cookieService, "http://expireme.org/", nsnull, "newtest=expiry; max-age=60", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
-      rv[7] = CheckResult(cookie.get(), MUST_CONTAIN, "test=expiry");
-      rv[8] = CheckResult(cookie.get(), MUST_CONTAIN, "newtest=expiry");
+      rv[9] = CheckResult(cookie.get(), MUST_CONTAIN, "test=expiry");
+      rv[10] = CheckResult(cookie.get(), MUST_CONTAIN, "newtest=expiry");
       SetACookie(cookieService, "http://expireme.org/", nsnull, "test=differentvalue; max-age=0", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
-      rv[9] = CheckResult(cookie.get(), MUST_EQUAL, "newtest=expiry");
+      rv[11] = CheckResult(cookie.get(), MUST_EQUAL, "newtest=expiry");
       SetACookie(cookieService, "http://expireme.org/", nsnull, "newtest=evendifferentvalue; max-age=0", nsnull);
       GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
-      rv[10] = CheckResult(cookie.get(), MUST_BE_NULL);
-
-      SetACookie(cookieService, "http://foo.expireme.org/", nsnull, "test=expiry; domain=.expireme.org; max-age=60", nsnull);
-      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
-      rv[11] = CheckResult(cookie.get(), MUST_EQUAL, "test=expiry");
-      SetACookie(cookieService, "http://bar.expireme.org/", nsnull, "test=differentvalue; domain=.expireme.org; max-age=0", nsnull);
-      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
       rv[12] = CheckResult(cookie.get(), MUST_BE_NULL);
 
-      allTestsPassed = PrintResult(rv, 13) && allTestsPassed;
+      SetACookie(cookieService, "http://foo.expireme.org/", nsnull, "test=expiry; domain=.expireme.org; max-age=60", nsnull);
+      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
+      rv[13] = CheckResult(cookie.get(), MUST_EQUAL, "test=expiry");
+      SetACookie(cookieService, "http://bar.expireme.org/", nsnull, "test=differentvalue; domain=.expireme.org; max-age=0", nsnull);
+      GetACookie(cookieService, "http://expireme.org/", nsnull, getter_Copies(cookie));
+      rv[14] = CheckResult(cookie.get(), MUST_BE_NULL);
+
+      allTestsPassed = PrintResult(rv, 15) && allTestsPassed;
 
 
       // *** multiple cookie tests
@@ -535,7 +541,7 @@ main(PRInt32 argc, char *argv[])
       rv[1] = CheckResult(cookie.get(), MUST_BE_NULL);
       SetACookie(cookieService, "http://parser.test/", nsnull, "test=\"fubar! = foo;bar\\\";\" parser; domain=.parser.test; max-age=6\nfive; max-age=2.63,", nsnull);
       GetACookie(cookieService, "http://parser.test/", nsnull, getter_Copies(cookie));
-      rv[2] = CheckResult(cookie.get(), MUST_CONTAIN, "test=\"fubar! = foo;bar\\\";\"");
+      rv[2] = CheckResult(cookie.get(), MUST_CONTAIN, "test=\"fubar! = foo");
       rv[3] = CheckResult(cookie.get(), MUST_CONTAIN, "five");
       SetACookie(cookieService, "http://parser.test/", nsnull, "test=kill; domain=.parser.test; max-age=0 \n five; max-age=0", nsnull);
       GetACookie(cookieService, "http://parser.test/", nsnull, getter_Copies(cookie));
diff --git a/netwerk/test/httpserver/httpd.js b/netwerk/test/httpserver/httpd.js
index a141b3e0b658..41ae8465d27f 100644
--- a/netwerk/test/httpserver/httpd.js
+++ b/netwerk/test/httpserver/httpd.js
@@ -57,6 +57,9 @@ const PR_UINT32_MAX = Math.pow(2, 32) - 1;
 /** True if debugging output is enabled, false otherwise. */
 var DEBUG = false; // non-const *only* so tweakable in server tests
 
+/** True if debugging output should be timestamped. */
+var DEBUG_TIMESTAMP = false; // non-const so tweakable in server tests
+
 var gGlobalObject = this;
 
 /**
@@ -75,7 +78,7 @@ function NS_ASSERT(cond, msg)
 
     var stack = new Error().stack.split(/\n/);
     dumpn(stack.map(function(val) { return "###!!!   " + val; }).join("\n"));
-    
+
     throw Cr.NS_ERROR_ABORT;
   }
 }
@@ -164,12 +167,32 @@ const HEADERS_SUFFIX = HIDDEN_CHAR + "headers" + HIDDEN_CHAR;
 /** Type used to denote SJS scripts for CGI-like functionality. */
 const SJS_TYPE = "sjs";
 
+/** Base for relative timestamps produced by dumpn(). */
+var firstStamp = 0;
 
-/** dump(str) with a trailing "\n" -- only outputs if DEBUG */
+/** dump(str) with a trailing "\n" -- only outputs if DEBUG. */
 function dumpn(str)
 {
   if (DEBUG)
-    dump(str + "\n");
+  {
+    var prefix = "HTTPD-INFO | ";
+    if (DEBUG_TIMESTAMP)
+    {
+      if (firstStamp === 0)
+        firstStamp = Date.now();
+
+      var elapsed = Date.now() - firstStamp; // milliseconds
+      var min = Math.floor(elapsed / 60000);
+      var sec = (elapsed % 60000) / 1000;
+
+      if (sec < 10)
+        prefix += min + ":0" + sec.toFixed(3) + " | ";
+      else
+        prefix += min + ":" + sec.toFixed(3) + " | ";
+    }
+
+    dump(prefix + str + "\n");
+  }
 }
 
 /** Dumps the current JS stack if DEBUG. */
diff --git a/testing/mochitest/server.js b/testing/mochitest/server.js
index bb88d5c5e826..4bb343a86f36 100644
--- a/testing/mochitest/server.js
+++ b/testing/mochitest/server.js
@@ -198,6 +198,7 @@ function createMochitestServer(serverBasePath)
 
   server.registerDirectory("/", serverBasePath);
   server.registerPathHandler("/server/shutdown", serverShutdown);
+  server.registerPathHandler("/server/debug", serverDebug);
   server.registerContentType("sjs", "sjs"); // .sjs == CGI-like functionality
   server.registerContentType("jar", "application/x-jar");
   server.registerContentType("ogg", "application/ogg");
@@ -310,6 +311,39 @@ function serverShutdown(metadata, response)
   server.stop(serverStopped);
 }
 
+// /server/debug?[012]
+function serverDebug(metadata, response)
+{
+  response.setStatusLine(metadata.httpVersion, 400, "Bad debugging level");
+  if (metadata.queryString.length !== 1)
+    return;
+
+  var mode;
+  if (metadata.queryString === "0") {
+    // do this now so it gets logged with the old mode
+    dumpn("Server debug logs disabled.");
+    DEBUG = false;
+    DEBUG_TIMESTAMP = false;
+    mode = "disabled";
+  } else if (metadata.queryString === "1") {
+    DEBUG = true;
+    DEBUG_TIMESTAMP = false;
+    mode = "enabled";
+  } else if (metadata.queryString === "2") {
+    DEBUG = true;
+    DEBUG_TIMESTAMP = true;
+    mode = "enabled, with timestamps";
+  } else {
+    return;
+  }
+
+  response.setStatusLine(metadata.httpVersion, 200, "OK");
+  response.setHeader("Content-type", "text/plain", false);
+  var body = "Server debug logs " + mode + ".";
+  response.bodyOutputStream.write(body, body.length);
+  dumpn(body);
+}
+
 //
 // DIRECTORY LISTINGS
 //
diff --git a/testing/mochitest/tests/test_bug100533.html b/testing/mochitest/tests/test_bug100533.html
deleted file mode 100644
index 6d9280f1917b..000000000000
--- a/testing/mochitest/tests/test_bug100533.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=100533
--->
-<head>
-  <title>Test for Bug 100533</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=100533">Mozilla Bug 100533</a>
-<p id="display"></p>
-<div id="content" >
-
-<button id="thebutton">Test</button>
-<iframe style='display: none;' src='/static/bug100533_iframe.html' id='a'></iframe>
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-SimpleTest.waitForExplicitFinish();
-
-/** Test for Bug 100533 **/
-var submitIframeForm = function() {
-  $('a').contentDocument.getElementById('b').submit();
-}
-
-submitted = function() { 
-  ok(true, "Finished. Form submits when located in iframe set to display:none;");
-  SimpleTest.finish(); 
-};
-
-addLoadEvent(function() {
-  connect("thebutton", "click", submitIframeForm);
-  signal("thebutton", "click");
-});
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug1297.html b/testing/mochitest/tests/test_bug1297.html
deleted file mode 100644
index 41b9bffba1d4..000000000000
--- a/testing/mochitest/tests/test_bug1297.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1297
--->
-<head>
-  <title>Test for Bug 1297</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1297">Mozilla Bug 1297</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-<table border=1>
-<tr>
-<td id="td1" onmousedown="alert(this.cellIndex)">cellIndex=0</td>
-<td id="td2" onmousedown="alert(this.cellIndex)">cellIndex=1</td>
-<td id="td3" onmousedown="alert(this.cellIndex)">cellIndex=2</td>
-<tr id="tr1"
-onmousedown="alert(this.rowIndex)"><td>rowIndex=1<td>rowIndex=1<td>rowIndex=1</t
-r>
-<tr id="tr2"
-onmousedown="alert(this.rowIndex)"><td>rowIndex=2<td>rowIndex=2<td>rowIndex=2</t
-r>
-</tr>
-</table>  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1297 **/
-is($('td1').cellIndex, 0, "cellIndex / rowIndex working td1");
-is($('td2').cellIndex, 1, "cellIndex / rowIndex working td2");
-is($('td3').cellIndex, 2, "cellIndex / rowIndex working td3");
-is($('tr1').rowIndex, 1, "cellIndex / rowIndex working tr1");
-is($('tr2').rowIndex, 2, "cellIndex / rowIndex working tr2");
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug1366.html b/testing/mochitest/tests/test_bug1366.html
deleted file mode 100644
index a66fa94fe3ed..000000000000
--- a/testing/mochitest/tests/test_bug1366.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1366
--->
-<head>
-  <title>Test for Bug 1366</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1366">Mozilla Bug 1366</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-<table id="testtable" width=150 border>
-	<tbody id="testbody">
-		<tr>
-			<td>cell content</td>
-		</tr>
-	</tbody>
-</table>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1366 **/
-$('testtable').removeChild($('testbody'));
-$('display').innerHTML = "SCRIPT: deleted first ROWGROUP\n";
-is($('testbody'), null, "deleting tbody works");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug1400.html b/testing/mochitest/tests/test_bug1400.html
deleted file mode 100644
index 355844881ddf..000000000000
--- a/testing/mochitest/tests/test_bug1400.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1400
--->
-<head>
-  <title>Test for Bug 1400</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1400">Mozilla Bug 1400</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1400 **/
-
-table = document.createElement("TABLE");
-thead = table.createTHead();
-thead2 = table.createTHead();
-
-table.appendChild(thead);
-table.appendChild(thead);
-table.appendChild(thead);
-table.appendChild(thead2);
-table.appendChild(thead2);
-table.appendChild(thead2);
-table.appendChild(thead);
-table.appendChild(thead2);
-
-is(table.childNodes.length, 1, 
-   "adding multiple theads results in one thead child");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug1682.html b/testing/mochitest/tests/test_bug1682.html
deleted file mode 100644
index 57edbc9bc432..000000000000
--- a/testing/mochitest/tests/test_bug1682.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1682
--->
-<head>
-  <title>Test for Bug 1682</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1682">Mozilla Bug 1682</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1682 **/
-var count = 1;
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function () {
-  is(count, 1, "onload executes once");
-  ++count;
-});
-addLoadEvent(SimpleTest.finish);
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug172261.html b/testing/mochitest/tests/test_bug172261.html
deleted file mode 100644
index d47de4159b92..000000000000
--- a/testing/mochitest/tests/test_bug172261.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=172261
--->
-<head>
-  <title>Test for Bug 172261</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=172261">Mozilla Bug 172261</a>
-<p id="display">
-  <iframe id="test"></iframe>
-</p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-  /** Test for Bug 172261 **/
-  SimpleTest.waitForExplicitFinish();
-
-  var callable = false;
-  function toggleCallable() { callable = true; }
-
-  var doTestInIframe = false;
-
-  // Shouldn't do history stuff from inside onload
-  addLoadEvent(function() { setTimeout(startTest, 10) });
-
-  function startTest() {
-    // First, create a dummy document.  Use onunload handlers to make sure
-    // bfcache doesn't screw us up.
-    var doc = $("test").contentDocument;
-    
-    doc.write("<html><body onunload=''>First</body></html>");
-    doc.close();
-
-    // Now write our test document
-    doc.write("<html><script>window.onerror = parent.onerror; if (parent.doTestInIframe) { parent.is(document.domain, parent.document.domain, 'Domains should match');  parent.toggleCallable(); } <"  + "/script><body>Second</body></html>");
-    doc.close();
-
-    $("test").onload = goForward;
-    history.back();
-  }
-
-  function goForward() {
-      $("test").onload = doTest;
-      doTestInIframe = true;
-      history.forward();
-  }
-
-  function doTest() {
-    is($("test").contentDocument.domain, document.domain,
-       "Domains should match 2");
-    // Make that into an is() once bug 269270 is fixed.
-    todo($("test").contentDocument.location.href == location.href,
-         "Locations should match");
-    is(callable, true, "Subframe should be able to call us");
-    SimpleTest.finish();
-  }
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug1823.html b/testing/mochitest/tests/test_bug1823.html
deleted file mode 100644
index c319f98bf781..000000000000
--- a/testing/mochitest/tests/test_bug1823.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1823
--->
-<head>
-  <title>Test for Bug 1823</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1823">Mozilla Bug 1823</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1823 **/
-ok((document.location + "").indexOf("[") == -1, "location object has a toString()");
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug2082.html b/testing/mochitest/tests/test_bug2082.html
deleted file mode 100644
index f429ce754c2b..000000000000
--- a/testing/mochitest/tests/test_bug2082.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=2082
--->
-<head>
-  <title>Test for Bug 2082</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=2082">Mozilla Bug 2082</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-<FORM name="gui" id="gui">
-<INPUT TYPE="text" NAME="field" VALUE="some value">
-</FORM>  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 2082 **/
-var guiform = document.getElementById("gui");
-ok(document.getElementById("gui").hasChildNodes(), "form elements should be treated as form's children");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug218236.html b/testing/mochitest/tests/test_bug218236.html
deleted file mode 100644
index 0e930393028d..000000000000
--- a/testing/mochitest/tests/test_bug218236.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=218236
--->
-<head>
-  <title>Test for Bug 218236</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=218236">Mozilla Bug 218236</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 218236 **/
-
-SimpleTest.waitForExplicitFinish();
-
-/* Test data */
-
-var url_200 = window.location.href;
-var url_404 = url_200.replace(/[^/]+$/, "this_file_is_not_going_to_be_there.dummy");
-var url_connection_error = url_200.replace(/^(\w+:\/\/[^/]+?)(:\d+)?\//, "$1:9546/");
-
-// List of tests: name of the test, URL to be requested, expected sequence
-// of events and optionally a function to be called from readystatechange handler.
-// Numbers in the list of events are values of XMLHttpRequest.readyState
-// when readystatechange event is triggered.
-var tests = [
-  ["200 OK",                            url_200,                [1, 2, 3, 4, "load"], null],
-  ["404 Not Found",                     url_404,                [1, 2, 3, 4, "load"], null],
-  ["connection error",                  url_connection_error,   [1, 2, 4, "error"],   null],
-  ["abort() call on readyState = 1",    url_200,                [1, 4],               doAbort1],
-  ["abort() call on readyState = 2",    url_200,                [1, 2, 4],            doAbort2],
-];
-
-var testName = null;
-var currentState = 0;
-var currentSequence = null;
-var expectedSequence = null;
-var currentCallback = null;
-
-var request = null;
-
-runNextTest();
-
-function doAbort1() {
-  if (request.readyState == 1)
-    request.abort();
-}
-function doAbort2() {
-  if (request.readyState == 2)
-    request.abort();
-}
-
-/* Utility functions */
-
-function runNextTest() {
-  if (tests.length > 0) {
-    var test = tests.shift();
-
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    // Prepare request object
-    request = new XMLHttpRequest();
-    request.open("GET", test[1]);
-    request.onreadystatechange = onReadyStateChange;
-    request.onload = onLoad;
-    request.onerror = onError;
-
-    // Initialize state variables
-    testName = test[0]
-    currentState = 0;
-    currentSequence = [];
-    expectedSequence = test[2];
-    currentCallback = test[3];
-
-    // Start request
-    request.send(null);
-  }
-  else
-    SimpleTest.finish();
-}
-
-function finalizeTest() {
-  ok(compareArrays(expectedSequence, currentSequence), "event sequence for '" + testName + "' should be " + expectedSequence.join(", "));
-
-  runNextTest();
-}
-
-function onReadyStateChange() {
-  // Ignore duplicated calls for the same ready state
-  if (request.readyState != currentState) {
-    currentState = request.readyState;
-    currentSequence.push(currentState);
-  }
-
-  if (currentState == 4) {
-    // Allow remaining event to fire but then we are finished with this test
-    setTimeout(finalizeTest, 0);
-  }
-
-  if (currentCallback)
-    currentCallback();
-}
-
-function onLoad() {
-  currentSequence.push("load");
-}
-
-function onError() {
-  currentSequence.push("error");
-}
-
-function compareArrays(array1, array2) {
-  if (array1.length != array2.length)
-    return false;
-
-  for (var i = 0; i < array1.length; i++)
-    if (array1[i] != array2[i])
-      return false;
-
-  return true;
-}
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug218277.html b/testing/mochitest/tests/test_bug218277.html
deleted file mode 100644
index e63f0188e528..000000000000
--- a/testing/mochitest/tests/test_bug218277.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=218277
--->
-<head>
-  <title>Test for Bug 218277</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=218277">Mozilla Bug 218277</a>
-<p id="display"></p>
-<div id="content" style="display: block">
-  <input id="ctrl" name="ctrl" size="20" value="keep&nbsp;together" readonly />
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 218277 **/
-
-is(escape($('ctrl').value), "keep%A0together", "nbsp preserved in form submissions");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug237071.html b/testing/mochitest/tests/test_bug237071.html
deleted file mode 100644
index ceb7ebd9fdac..000000000000
--- a/testing/mochitest/tests/test_bug237071.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=237071
--->
-<head>
-  <title>Test for Bug 237071</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=237071">Mozilla Bug 237071</a>
-<p id="display"></p>
-<div id="content" >
-  <ol id="theOL" start="22">
-    <li id="foo" >should be 22</li>
-    <li id="foo23">should be 23</li>
-  </ol>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-/** Test for Bug 237071 **/
-is($('theOL').start, 22, "OL start attribute mapped to .start, not just text attribute");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug238409.html b/testing/mochitest/tests/test_bug238409.html
deleted file mode 100644
index c9b4f25a078b..000000000000
--- a/testing/mochitest/tests/test_bug238409.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=238409
--->
-<head>
-  <title>Test for Bug 238409</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=238409">Mozilla Bug 238409</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <table id="table_spacing0" cellspacing="0">
-    <tr><td>cellspacing="0"</td></tr>
-  </table>
-
-  <table id="table_spacing2" cellspacing="2">
-    <tr><td>cellspacing="2"</td></tr>
-  </table>
-
-  <table id="table_spacingNone">
-    <tr><td>no cellspacing</td></tr>
-  </table>
-  
-  <table id="table_spacingMalformed" cellspacing>
-    <tr><td>malformed cellspacing</td></tr>
-  </table>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 238409 **/
-
-ok(document.getElementById("table_spacing0").cellSpacing == "0", "parsing table with cellspacing='0'");
-ok(document.getElementById("table_spacing2").cellSpacing == "2", "parsing table with cellspacing='2'");
-ok(document.getElementById("table_spacingNone").cellSpacing == "", "parsing table without cellspacing");
-ok(document.getElementById("table_spacingMalformed").cellSpacing == "", "parsing table with malformed cellspacing");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug24958.html b/testing/mochitest/tests/test_bug24958.html
deleted file mode 100644
index 3cd04d1c513f..000000000000
--- a/testing/mochitest/tests/test_bug24958.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=24958
--->
-<head>
-  <title>Test for Bug 24958</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <SCRIPT id="foo" TYPE="text/javascript">/*This space intentionally left blank*/</SCRIPT>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=24958">Mozilla Bug 24958</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 24958 **/
-ok($("foo").text, "\/*This space intentionally left blank*\/", "HTMLScriptElement.text should return text")
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug277724.html b/testing/mochitest/tests/test_bug277724.html
deleted file mode 100644
index ace086776b55..000000000000
--- a/testing/mochitest/tests/test_bug277724.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=277724
--->
-<head>
-  <title>Test for Bug 277724</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=277724">Mozilla Bug 277724</a>
-<p id="display"></p>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 277724 **/
-
-var childUnloaded = false;
-
-var nodes = [
-  [ "select", HTMLSelectElement ],
-  [ "textarea", HTMLTextAreaElement ],
-  [ "text", HTMLInputElement ],
-  [ "password", HTMLInputElement ],
-  [ "checkbox", HTMLInputElement ],
-  [ "radio", HTMLInputElement ],
-  [ "image", HTMLInputElement ],
-  [ "submit", HTMLInputElement ],
-  [ "reset", HTMLInputElement ],
-  [ "button input", HTMLInputElement ],
-  [ "hidden", HTMLInputElement ],
-  [ "file", HTMLInputElement ],
-  [ "submit button", HTMLButtonElement ],
-  [ "reset button", HTMLButtonElement ],
-  [ "button", HTMLButtonElement ]
-];
-
-function startTest(frameid) {
-  is(childUnloaded, false, "Child not unloaded yet");
-
-  var doc = $(frameid).contentDocument;
-  ok(doc instanceof Document, "Check for doc", "doc should be a document");
-
-  for (var i = 0; i < nodes.length; ++i) {
-    var id = nodes[i][0];
-    var node = doc.getElementById(id);
-    ok(node instanceof nodes[i][1],
-       "Check for " + id, id + " should be a " + nodes[i][1]);
-    is(node.disabled, false, "check for " + id + " state");
-    node.disabled = true;
-    is(node.disabled, true, "check for " + id + " state change");
-  }
-  
-  $(frameid).onload = function () { continueTest(frameid) };
-
-  // Do this off a timeout so it's not treated like a replace load.
-  function loadBlank() {
-    $(frameid).contentWindow.location = "about:blank";
-  }
-  setTimeout(loadBlank, 0);
-}
-
-function continueTest(frameid) {
-  is(childUnloaded, true, "Unload handler should have fired");
-  var doc = $(frameid).contentDocument;
-  ok(doc instanceof Document, "Check for doc", "doc should be a document");
-
-  for (var i = 0; i < nodes.length; ++i) {
-    var id = nodes[i][0];
-    var node = doc.getElementById(id);
-    ok(node === null,
-       "Check for " + id, id + " should be null");
-  }
-  
-  $(frameid).onload = function() { finishTest(frameid) };
-
-  // Do this off a timeout too.  Why, I'm not sure.  Something in session
-  // history creates another history state if we don't.  :(
-  function goBack() {
-    $(frameid).contentWindow.history.back();
-  }
-  setTimeout(goBack, 0);
-}
-
-// XXXbz this is a nasty hack to work around the XML content sink not being
-// incremental, so that the _first_ control we test is ok but others are not.
-var testIs = is;
-var once = false;
-function flipper(a, b, c) {
-  if (once) {
-    todo(a == b, c);
-  } else {
-    once = true;
-    is(a, b, c);
-  }
-}
-
-function finishTest(frameid) {
-  var doc = $(frameid).contentDocument;
-  ok(doc instanceof Document, "Check for doc", "doc should be a document");
-
-  for (var i = 0; i < nodes.length; ++i) {
-    var id = nodes[i][0];
-    var node = doc.getElementById(id);
-    ok(node instanceof nodes[i][1],
-       "Check for " + id, id + " should be a " + nodes[i][1]);
-    testIs(node.disabled, true, "check for " + id + " state restore");
-  }
-
-  if (frameid == "frame2") {
-    SimpleTest.finish();
-  } else {
-    childUnloaded = false;
-
-    // XXXbz this is a nasty hack to deal with the content sink.  See above.
-    testIs = flipper;
-    
-    $("frame2").onload = function () { startTest("frame2") };
-    $("frame2").src = "/static/bug277724_iframe2.xhtml";
-  }
-}
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
-
-<!-- Don't use display:none, since we don't support framestate restoration
-     without a frame tree -->
-<div id="content" style="visibility: hidden">
-  <iframe src="/static/bug277724_iframe1.html" id="frame1"
-          onload="startTest('frame1')"></iframe>
-  <iframe src="" id="frame2"></iframe>
-</div>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug300691-1.html b/testing/mochitest/tests/test_bug300691-1.html
deleted file mode 100644
index 39d63e57ae15..000000000000
--- a/testing/mochitest/tests/test_bug300691-1.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=300691
--->
-<head>
-  <title>Test for Bug 300691</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="/tests/SimpleTest/EventUtils.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=300691">Mozilla Bug 300691</a>
-<p id="display">
-  <textarea id="target"></textarea>
-</p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var t = $("target");
-  
-/** Test for Bug 300691 **/
-function valueIs(arg, reason) {
-  is(t.value, arg, reason);
-}
-
-function defValueIs(arg, reason) {
-  is(t.defaultValue, arg, reason);
-}
-
-valueIs("", "Nothing in the textarea");
-defValueIs("", "Nothing in the textarea 2");
-
-t.appendChild(document.createTextNode("ab"));
-valueIs("ab", "Appended textnode");
-defValueIs("ab", "Appended textnode 2");
-
-t.firstChild.data = "abcd";
-valueIs("abcd", "Modified textnode text");
-defValueIs("abcd", "Modified textnode text 2");
-
-t.appendChild(document.createTextNode("efgh"));
-valueIs("abcdefgh", "Appended another textnode");
-defValueIs("abcdefgh", "Appended another textnode 2");
-
-t.removeChild(t.lastChild);
-valueIs("abcd", "Removed textnode");
-defValueIs("abcd", "Removed textnode 2");
-
-t.appendChild(document.createTextNode("efgh"));
-valueIs("abcdefgh", "Appended yet another textnode");
-defValueIs("abcdefgh", "Appended yet another textnode 2");
-
-t.normalize();
-valueIs("abcdefgh", "Normalization changes nothing for the value");
-defValueIs("abcdefgh", "Normalization changes nothing for the value 2");
-
-t.defaultValue = "abc";
-valueIs("abc", "Just set the default value on non-edited textarea");
-defValueIs("abc", "Just set the default value on non-edited textarea 2");
-
-t.appendChild(document.createTextNode("defgh"));
-valueIs("abcdefgh", "Appended another textnode again");
-defValueIs("abcdefgh", "Appended another textnode again 2");
-
-t.focus(); // This puts the caret at the end of the textarea, and doing
-           // something like "home" in a cross-platform way is kinda hard.
-sendKey("left");
-sendKey("left");
-sendKey("left");
-sendString("Test");
-
-valueIs("abcdeTestfgh", "Typed 'Test' after three left-arrows starting from end");
-defValueIs("abcdefgh", "Typing 'Test' shouldn't affect default value");
-
-sendKey("right");
-sendKey("right");
-sendKey("back_space");
-sendKey("back_space");
-
-valueIs("abcdeTesth",
-        "Backspaced twice after two right-arrows starting from end of typing");
-defValueIs("abcdefgh", "Deleting shouldn't affect default value");
-
-t.appendChild(document.createTextNode("ijk"));
-valueIs("abcdeTesth",
-        "Appending textnode shouldn't affect value in edited textarea");
-defValueIs("abcdefghijk", "Appended textnode 3");
-
-t.lastChild.data = "lmno";
-valueIs("abcdeTesth",
-        "Modifying textnode text shouldn't affect value in edited textarea");
-defValueIs("abcdefghlmno", "Modified textnode text 3");
-
-t.removeChild(t.firstChild);
-valueIs("abcdeTesth",
-        "Removing child textnode shouldn't affect value in edited textarea");
-defValueIs("defghlmno", "Removed textnode 3");
-
-t.insertBefore(document.createTextNode("abc"), t.firstChild);
-valueIs("abcdeTesth",
-        "Inserting child textnode shouldn't affect value in edited textarea");
-defValueIs("abcdefghlmno", "Inserted a text node");
-
-t.normalize();
-valueIs("abcdeTesth", "Normalization changes nothing for the value 3");
-defValueIs("abcdefghlmno", "Normalization changes nothing for the value 4");
-
-t.defaultValue = "abc";
-valueIs("abcdeTesth", "Setting default value shouldn't affect edited textarea");
-defValueIs("abc", "Just set the default value textarea");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug300691-2.html b/testing/mochitest/tests/test_bug300691-2.html
deleted file mode 100644
index e2a4e4986dd8..000000000000
--- a/testing/mochitest/tests/test_bug300691-2.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=300691
--->
-<head>
-  <title>Test for Bug 300691</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=300691">Mozilla Bug 300691</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="text/javascript">
-  // First, setup.  We'll be toggling these variables as we go.
-  // Note that scripts don't execute immediately when you put text in them --
-  // they wait for the currently-running script to finish.
-  var test1Ran = false;
-  var test2Ran = false;
-  var test3Ran = false;
-  var test4Ran = false;
-  var test5Ran = false;
-  var test6Ran = false;
-  var test7Ran = false;
-  var test8Ran = false;
-  var test9Ran = false;
-  var test10Ran = false;
-  var test11Ran = false;
-  var test12Ran = false;
-  var test13Ran = false;
-  var test14aRan = false;
-  var test14bRan = false;
-  var test15aRan = false;
-  var test15bRan = false;
-</script>
-<script id="test1" type="text/javascript">test1Ran = true;</script>
-<script id="test2" type="text/javascript"></script>
-<script id="test3" type="text/javascript">;</script>
-<script id="test4" type="text/javascript">   </script>
-<script id="test5" type="text/javascript"></script>
-<script id="test6" type="text/javascript"></script>
-<script id="test7" type="text/javascript"></script>
-<script id="test8" type="text/javascript"></script>
-<script id="test9" type="text/javascript"></script>
-<script id="test10" type="text/javascript" src="data:text/javascript,">
-  test10Ran = true;
-</script>
-<script id="test11" type="text/javascript"
-        src="data:text/javascript,test11Ran = true">
-  test11Ran = false;
-</script>
-<script id="test12" type="text/javascript"></script>
-<script id="test13" type="text/javascript"></script>
-<script id="test14" type="text/javascript"></script>
-<script id="test15" type="text/javascript"></script>
-<script class="testbody" type="text/javascript">
-  /** Test for Bug 300691 **/
-  $("test2").appendChild(document.createTextNode("test2Ran = true"));
-  is(test2Ran, false, "Not yet 2!");
-
-  $("test3").appendChild(document.createTextNode("test3Ran = true"));
-  is(test3Ran, false, "Not yet 3!");
-
-  $("test4").appendChild(document.createTextNode("test4Ran = true"));
-  is(test4Ran, false, "Not yet 4!");
-
-  $("test5").appendChild(document.createTextNode(" "));
-  $("test5").appendChild(document.createTextNode("test5Ran = true"));
-  is(test5Ran, false, "Not yet 5!");
-
-  $("test6").appendChild(document.createTextNode(" "));
-
-  $("test7").appendChild(document.createTextNode(""));
-
-  $("test8").appendChild(document.createTextNode(""));
-
-  $("test9").appendChild(document.createTextNode(""));
-
-  $("test12").src = "data:text/javascript,test12Ran = true;";
-  is(test12Ran, false, "Not yet 12!");
-
-  $("test13").setAttribute("src", "data:text/javascript,test13Ran = true;");
-  is(test13Ran, false, "Not yet 13!");
-
-  $("test14").src = "data:text/javascript,test14aRan = true;";
-  $("test14").appendChild(document.createTextNode("test14bRan = true"));
-  is(test14aRan, false, "Not yet 14a!");
-  is(test14bRan, false, "Not yet 14b!");
-
-  $("test15").src = "data:text/javascript,test15aRan = true;";
-  $("test15").appendChild(document.createTextNode("test15bRan = true"));
-  $("test15").removeAttribute("src");
-  is(test15aRan, false, "Not yet 15a!");
-  is(test15bRan, false, "Not yet 15b!");
-</script>
-<script type="text/javascript">
-  // Follow up on some of those
-  $("test6").appendChild(document.createTextNode("test6Ran = true"));
-  is(test6Ran, false, "Not yet 6!");
-
-  $("test7").appendChild(document.createTextNode("test7Ran = true"));
-  is(test7Ran, false, "Not yet 7!");
-
-  $("test8").insertBefore(document.createTextNode("test8Ran = true"),
-                          $("test8").firstChild);
-  is(test8Ran, false, "Not yet 8!");
-
-  $("test9").firstChild.data = "test9Ran = true";
-  is(test9Ran, false, "Not yet 9!");
-</script>
-<script type="text/javascript">
-  is(test1Ran, true, "Should have run!");
-  is(test2Ran, true, "Should execute empty script on child append");
-  is(test3Ran, false, "Already executed test3 script once");
-  is(test4Ran, false,
-     "Shouldn't execute whitespace-only script on child append; should have executed it before");
-  is(test5Ran, true,
-     "By the time it tries to execute, it's got both textnodes");
-  is(test6Ran, false,
-     "Shouldn't execute whitespace-only script on child append 2; should have executed it when it became nonempty");
-  is(test7Ran, true, "Should execute empty script on child append 2");
-  is(test8Ran, true, "Should execute empty script on child insert");
-  is(test9Ran, true, "Should execute empty script if child gets some text");
-  is(test10Ran, false, "Has an src; inline part shouldn't run");
-  is(test11Ran, true, "Script with src should have run");
-  is(test12Ran, true, "Setting src should execute script");
-  is(test13Ran, true, "Setting src attribute should execute script");
-  is(test14aRan, true, "src attribute takes precedence over inline content");
-  is(test14bRan, false, "src attribute takes precedence over inline content 2");
-  is(test15aRan, true,
-     "src attribute load should have started before the attribute got removed");
-  is(test15bRan, false,
-     "src attribute still got executed, so this shouldn't have been");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug300691-3.xhtml b/testing/mochitest/tests/test_bug300691-3.xhtml
deleted file mode 100644
index df20ff992d87..000000000000
--- a/testing/mochitest/tests/test_bug300691-3.xhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=300691
--->
-<head>
-  <title>Test for Bug 300691</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=300691">Mozilla Bug 300691</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="text/javascript">
-  // First, setup.  We'll be toggling these variables as we go.
-  // Note that scripts don't execute immediately when you put text in them --
-  // they wait for the currently-running script to finish.
-  var test1Ran = false;
-  var test2Ran = false;
-  var test3Ran = false;
-</script>
-<script id="test1" type="text/javascript">test1Ran = true;</script>
-<script id="test2" type="text/javascript"></script>
-<script id="test3" type="text/javascript"></script>
-<script class="testbody" type="text/javascript">
-<![CDATA[
-  /** Test for Bug 300691 **/
-  $("test2").appendChild(document.createCDATASection("test2Ran = true"));
-  is(test2Ran, false, "Not yet 2!");
-
-  $("test3").appendChild(document.createCDATASection(""));
-]]>
-</script>
-<script type="text/javascript">
-  // Follow up on some of those
-  $("test3").firstChild.data = "test3Ran = true";
-  is(test3Ran, false, "Not yet 3!");
-</script>
-<script type="text/javascript">
-  is(test1Ran, true, "Should have run!");
-  is(test2Ran, true, "Should execute empty script on child append");
-  is(test3Ran, true, "Should execute empty script if child gets some text");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug302186.html b/testing/mochitest/tests/test_bug302186.html
deleted file mode 100644
index e6de785dbe34..000000000000
--- a/testing/mochitest/tests/test_bug302186.html
+++ /dev/null
@@ -1,423 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=302186
--->
-<head>
-  <title>Test for Bug 302186</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<style>
-
-
-span { color: red }
-:default + span { color: green }
-
-
-/* static default 5 */
-span.reverse5 { color: green }
-:default + span.reverse5 { color: red }
-
-
-/* dynamic default 6 */
-span.reverse6 { color: green }
-:default + span.reverse6 { color: red }
-
-/* dynamic default 7 */
-span.reverse7 { color: green }
-:default + span.reverse7 { color: red }
-
-/* dynamic default 8 */
-span.reverse8 { color: green }
-:default + span.reverse8 { color: red }
-
-/* dynamic default 9 */
-span.reverse9 { color: green }
-:default + span.reverse9 { color: red }
-
-/* dynamic default 10 */
-span.reverse10 { color: green }
-:default + span.reverse10 { color: red }
-
-/* dynamic default 11 */
-span.reverse11 { color: green }
-:default + span.reverse11 { color: red }
-
-/* dynamic default 12 */
-span.reverse12 { color: green }
-:default + span.reverse12 { color: red }
-
-/* dynamic default 13 */
-span.reverse13 { color: green }
-:default + span.reverse13 { color: red }
-
-/* dynamic default 14 */
-span.reverse14 { color: green }
-:default + span.reverse14 { color: red }
-
-/* dynamic default 15 */
-span.reverse15 { color: green }
-:default + span.reverse15 { color: red }
-
-/* dynamic default 16 */
-span.reverse16 { color: green }
-:default + span.reverse16 { color: red }
-
-/* dynamic default 17 */
-span.reverse17 { color: green }
-:default + span.reverse17 { color: red }
-
-/* dynamic default 18 */
-span.reverse18 { color: green }
-:default + span.reverse18 { color: red }
-
-/* dynamic default 19 */
-span.reverse19 { color: green }
-:default + span.reverse19 { color: red }
-
-/* dynamic default 20 */
-span.reverse20 { color: green }
-:default + span.reverse20 { color: red }
-
-
-button { display: none }
-input { display: none }
-</style>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=302186">Mozilla Bug 302186</a>
-<p id="display"></p>
-<div id="content" style="display: block">
-   
-  <!-- static default 5 -->
-  <form>
-   <div>
-    <input type="image"><span id="5a">There should be no red.</span>
-   </div>
-   <div>
-  <input type="image"><span id="5b" class="reverse5">There should be no red.</span>
-
-   </div>
-  </form>
-
-  <!-- dynamic default 6 -->
-  <form>
-  <div id="div6">
-  <span id="6a">There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span id="6b" class="reverse6">There should be no red.</span>
-</div>
-  </form>
-
-  <!-- dynamic default 7 -->
-  <form>
-<div>
-  <input type="submit"><span id="7a">There should be no red.</span>
-</div>
-<div id="div7">
-  <span class="reverse7" id="7b">There should be no red.</span>
-
-</div>
-</form>
-
-  <!-- dynamic default 8 -->
-<form>
-<div id="div8"><span id="8a">There should be no red.</span>
-</div>
-<div>
-  <input type="image" id="foo"><span class="reverse8" id="8b">There should be no red.</span>
-
-</div>
-</form>
-
-  <!-- dynamic default 9 -->
-<form>
-<div>
-  <input type="image"><span id="9a">There should be no red.</span>
-</div>
-<div id="div9">
-  <span class="reverse9" id="9b">There should be no red.</span>
-
-</div>
-</form>
-
-  <!-- dynamic default 10 -->
-<form>
-<div id="div10">
-  <input type="submit"><span id="10a" class="reverse10">There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span id="10b" >There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 11 -->
-<form>
-<div id="div11a">
-  <input type="submit"><span id="11a">There should be no red.</span>
-</div>
-<div id="div11">
-  <input type="submit"><span id="11b" class="reverse11">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 12 -->
-<form>
-<div id="div12">
-  <input type="image"><span id="12a" class="reverse12">There should be no red.</span>
-</div>
-<div>
-  <input type="image"><span id="12b">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 13 -->
-<form>
-<div id="div13a">
-  <input type="image"><span id="13a">There should be no red.</span>
-</div>
-<div id="div13">
-  <input type="image"><span id="13b" class="reverse13">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 14 -->
-<form>
-<div id="div14a">
-  <input type="submit" id="foo14"><span id="14a">There should be no red.</span>
-</div>
-<div id="div14b">
-  <input type="submit" id="foo14b"><span id="14b" class="reverse14">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 15 -->
-<form>
-<div id="div15a">
-  <input type="image" id="foo15a"><span id="15a">There should be no red.</span>
-</div>
-<div id="div15b">
-  <input type="image" id="foo15b"><span id="15b" class="reverse15">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 16 -->
-<form>
-<div>
-  <input type="image" checked="checked" id="foo16"></button>
-  <span class="reverse16" id="16a">There should be no red.</span>
-</div>
-<div>
-  <input type="image"></button><span id="16b">There should be no red.</span>
-
-</div>
-</form>
-
-<!-- dynamic default 17 -->
-<form>
-<div>
-  <button type="button" id="foo17"></button>
-  <span id="17a">There should be no red.</span>
-</div>
-<div>
-  <button type="submit"></button><span class="reverse17" id="17b">There should be no red.</span>
-</div>
-</form>
-
-<!-- dynamic default 18 -->
-<form>
-<div>
-  <input type="button" id="foo18"></button>
-  <span id="18a">There should be no red.</span>
-</div>
-<div>
-  <input type="submit"></button><span id="18b" class="reverse18">There should be no red.</span>
-
-</div>
-</form>
-
-
-
-<!-- dynamic default 19 -->
-<form>
-<div id="div19">
-  <span id="19a">There should be no red.</span>
-</div>
-</form>
-
-<!-- dynamic default 20 -->
-<form>
-<div id="div20">
-  <span id="20a">There should be no red.</span>
-</div>
-</form>
-
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 302186 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function idColor(anId) {
- var color = Color.fromComputedStyle(anId, "color");
- return color.toRGBString();
-}
-
-is(idColor("5a"),"rgb(0,128,0)", "CSS static-default 5a");
-is(idColor("5b"),"rgb(0,128,0)", "CSS static-default 5b");
-
-function dynamicDefault6() {
-  var but = document.createElement("input");
-  but.setAttribute("type", "submit");
-  $('div6').insertBefore(but, $('div6').firstChild);
-  is(idColor("6a"),"rgb(0,128,0)", "CSS dynamic-default 6a");
-  is(idColor("6b"),"rgb(0,128,0)", "CSS dynamic-default 6b");
-}
-
-function dynamicDefault7() {
-  var but = document.createElement("input");
-  but.setAttribute("type", "submit");
-  $('div7').insertBefore(but, $('div7').firstChild);
-  is(idColor("7a"),"rgb(0,128,0)", "CSS dynamic-default 7a");
-  is(idColor("7b"),"rgb(0,128,0)", "CSS dynamic-default 7b");
-}
-
-function dynamicDefault8() {
-  var but = document.createElement("input");
-  but.setAttribute("type", "image");
-  $('div8').insertBefore(but, $('div8').firstChild);
-  is(idColor("8a"),"rgb(0,128,0)", "CSS dynamic-default 8a");
-  is(idColor("8b"),"rgb(0,128,0)", "CSS dynamic-default 8b");
-}
-
-function dynamicDefault9() {
-  var but = document.createElement("input");
-  but.setAttribute("type", "image");
-  $('div9').insertBefore(but, $('div9').firstChild);
-  is(idColor("9a"),"rgb(0,128,0)", "CSS dynamic-default 9a");
-  is(idColor("9b"),"rgb(0,128,0)", "CSS dynamic-default 9b");
-}
-
-function dynamicDefault10() {
-  var inputs = $('div10').getElementsByTagName("input");
-  $('div10').removeChild(inputs[0]);
-  todo(idColor("10a") == "rgb(0,128,0)", "CSS dynamic-default 10a");
-  is(idColor("10b"),"rgb(0,128,0)", "CSS dynamic-default 10b");
-}
-
-function dynamicDefault11() {
-  var inputs = $('div11').getElementsByTagName("input");
-  $('div11').removeChild(inputs[0]);
-  is(idColor("11a"),"rgb(0,128,0)", "CSS dynamic-default 11a");
-  is(idColor("11b"),"rgb(0,128,0)", "CSS dynamic-default 11b");
-}
-
-function dynamicDefault12() {
-  var inputs = $('div12').getElementsByTagName("input");
-  $('div12').removeChild(inputs[0]);
-  todo(idColor("12a") == "rgb(0,128,0)", "CSS dynamic-default 12a");
-  is(idColor("12b"),"rgb(0,128,0)", "CSS dynamic-default 12b");
-}
-
-function dynamicDefault13() {
-  var inputs = $('div13').getElementsByTagName("input");
-  $('div13').removeChild(inputs[0]);
-  is(idColor("13a"),"rgb(0,128,0)", "CSS dynamic-default 13a");
-  is(idColor("13b"),"rgb(0,128,0)", "CSS dynamic-default 13b");
-}
-
-function dynamicDefault14() {
-  var div1 = document.getElementById("div14a");
-  var inputs = div1.getElementsByTagName("input");
-  var firstElement = div1.removeChild(inputs[0]);
-  var div2 = document.getElementById("div14b");
-  inputs = div2.getElementsByTagName("input");
-  var secondElement = div2.removeChild(inputs[0]);
-  div1.insertBefore(secondElement, div1.firstChild);
-  div2.insertBefore(firstElement, div2.firstChild);
-  is(idColor("14a"),"rgb(0,128,0)", "CSS dynamic-default 14a");
-  is(idColor("14b"),"rgb(0,128,0)", "CSS dynamic-default 14b");
-}
-
-function dynamicDefault15() {
-  var div1 = document.getElementById("div15a");
-  var inputs = div1.getElementsByTagName("input");
-  var firstElement = div1.removeChild(inputs[0]);
-  var div2 = document.getElementById("div15b");
-  inputs = div2.getElementsByTagName("input");
-  var secondElement = div2.removeChild(inputs[0]);
-  div1.insertBefore(secondElement, div1.firstChild);
-  div2.insertBefore(firstElement, div2.firstChild);
-  is(idColor("15a"),"rgb(0,128,0)", "CSS dynamic-default 15a");
-  is(idColor("15b"),"rgb(0,128,0)", "CSS dynamic-default 15b");
-}
-
-function dynamicDefault16() {
-  $("foo16").setAttribute("type", "button");
-  is(idColor("16a"),"rgb(0,128,0)", "CSS dynamic-default 16a");
-  is(idColor("16b"),"rgb(0,128,0)", "CSS dynamic-default 16b");
-}
-
-function dynamicDefault17() {
-  $("foo17").setAttribute("type", "submit");
-  is(idColor("17a"),"rgb(0,128,0)", "CSS dynamic-default 17a");
-  is(idColor("17b"),"rgb(0,128,0)", "CSS dynamic-default 17b");
-}
-
-function dynamicDefault18() {
-  $("foo18").setAttribute("type", "submit");
-  is(idColor("18a"),"rgb(0,128,0)", "CSS dynamic-default 18a");
-  is(idColor("18b"),"rgb(0,128,0)", "CSS dynamic-default 18b");
-}
-
-function dynamicDefault19() {
-  var newSubmit = document.createElement("input");
-  newSubmit.setAttribute("type", "submit");
-  var div1 = document.getElementById("div19");
-  div1.insertBefore(newSubmit, div1.firstChild);
-  is(idColor("19a"),"rgb(0,128,0)", "CSS dynamic-default 19a");
-}
-
-function dynamicDefault20() {
-  var newSubmit = document.createElement("input");
-  newSubmit.setAttribute("type", "image");
-  var div1 = document.getElementById("div20");
-  div1.insertBefore(newSubmit, div1.firstChild);
-  is(idColor("20a"),"rgb(0,128,0)", "CSS dynamic-default 20a");
-}
-
-addLoadEvent(dynamicDefault6);
-addLoadEvent(dynamicDefault7);
-addLoadEvent(dynamicDefault8);
-addLoadEvent(dynamicDefault9);
-addLoadEvent(dynamicDefault10);
-addLoadEvent(dynamicDefault11);
-addLoadEvent(dynamicDefault12);
-addLoadEvent(dynamicDefault13);
-addLoadEvent(dynamicDefault14);
-addLoadEvent(dynamicDefault15);
-addLoadEvent(dynamicDefault16);
-addLoadEvent(dynamicDefault17);
-addLoadEvent(dynamicDefault18);
-addLoadEvent(dynamicDefault19);
-addLoadEvent(dynamicDefault20);
-
-addLoadEvent(SimpleTest.finish);
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug308484.html b/testing/mochitest/tests/test_bug308484.html
deleted file mode 100644
index 014a570cc36a..000000000000
--- a/testing/mochitest/tests/test_bug308484.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=308484
--->
-<head>
-  <title>Test for Bug 308484</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=308484">Mozilla Bug 308484</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 308484 **/
-
-var headers = ["Host", "Content-Length", "Transfer-Encoding", "Via", "Upgrade"];
-var i, request;
-
-// Try setting headers in unprivileged context
-request = new XMLHttpRequest();
-request.open("GET", window.location.href);
-for (i = 0; i < headers.length; i++)
-  request.setRequestHeader(headers[i], "test" + i);
-
-// Read out headers
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-var channel = request.channel.QueryInterface(Components.interfaces.nsIHttpChannel);
-for (i = 0; i < headers.length; i++) {
-  // Retrieving Content-Length will throw an exception
-  var value = null;
-  try {
-    value = channel.getRequestHeader(headers[i]);
-  }
-  catch(e) {}
-
-  isnot(value, "test" + i, "Setting " + headers[i] + " header in unprivileged context");
-}
-
-// Try setting headers in privileged context
-request = new XMLHttpRequest();
-request.open("GET", window.location.href);
-for (i = 0; i < headers.length; i++)
-  request.setRequestHeader(headers[i], "test" + i);
-
-// Read out headers
-var channel = request.channel.QueryInterface(Components.interfaces.nsIHttpChannel);
-for (i = 0; i < headers.length; i++) {
-  var value = channel.getRequestHeader(headers[i]);
-  is(value, "test" + i, "Setting " + headers[i] + " header in privileged context");
-}
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug308856.html b/testing/mochitest/tests/test_bug308856.html
deleted file mode 100644
index 9c2034188fee..000000000000
--- a/testing/mochitest/tests/test_bug308856.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=308856
--->
-<head>
-  <title>Test for Bug 308856</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=308856">Mozilla Bug 308856</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 308856 **/
-
-var monkey = 12;
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
-  is(12,window.monkey,"Window global is correct value");
-  var found = false;
-  for (var p in window) {
-    if (p == "monkey") {
-      found = true;
-    }
-  }
-  ok(found, "Global js variables show up when enumerating [Window]");
-});
-addLoadEvent(SimpleTest.finish);
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug311681.html b/testing/mochitest/tests/test_bug311681.html
deleted file mode 100644
index 46fb7908c6e9..000000000000
--- a/testing/mochitest/tests/test_bug311681.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=311681
--->
-<head>
-  <title>Test for Bug 311681</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=311681">Mozilla Bug 311681</a>
-<script class="testbody" type="text/javascript">
-  // Setup script
-  SimpleTest.waitForExplicitFinish();
-
-  // Make sure to trigger the hashtable case by asking for enough elements
-  // by ID.
-  for (var i = 0; i < 256; ++i) {
-    var x = document.getElementById(i);
-  }
-
-  // save off the document.getElementById function, since getting it as a
-  // property off the document it causes a content flush.      
-  var fun = document.getElementById;
-
-  // Slot for our initial element with id "content"
-  var testNode;
-
-  function getCont() {
-    return fun.call(document, "content");
-  }
-  
-  function testClone() {
-    // Test to make sure that if we have multiple nodes with the same ID in
-    // a document we don't forget about one of them when the other is
-    // removed.
-    var newParent = $("display");
-    var node = testNode.cloneNode(true);
-    isnot(node, testNode, "Clone should be a different node");
-
-    newParent.appendChild(node);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 1");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 1");
-    
-    clear(newParent);
-    
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 2");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 2");
-
-    node = testNode.cloneNode(true);
-    newParent.appendChild(node);
-    testNode.parentNode.removeChild(testNode);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), node, "Should be getting clone pre-flush");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), node, "Should be getting clone post-flush");
-
-  }
-
-  function clear(node) {
-    while (node.hasChildNodes()) {
-      node.removeChild(node.firstChild);
-    }
-  }
-
-  addLoadEvent(testClone);
-  addLoadEvent(SimpleTest.finish);
-</script>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <script class="testbody" type="text/javascript">
-    testNode = fun.call(document, "content");
-    isnot(testNode, null, "Should have node here");
-  </script>
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug311681.xhtml b/testing/mochitest/tests/test_bug311681.xhtml
deleted file mode 100644
index d869cc3b3ba0..000000000000
--- a/testing/mochitest/tests/test_bug311681.xhtml
+++ /dev/null
@@ -1,105 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=311681
--->
-<head>
-  <title>Test for Bug 311681</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=311681">Mozilla Bug 311681</a>
-<script class="testbody" type="text/javascript">
-<![CDATA[
-  // Setup script
-  SimpleTest.waitForExplicitFinish();
-
-  // Make sure to trigger the hashtable case by asking for enough elements
-  // by ID.
-  for (var i = 0; i < 256; ++i) {
-    var x = document.getElementById(i);
-  }
-
-  // save off the document.getElementById function, since getting it as a
-  // property off the document it causes a content flush.      
-  var fun = document.getElementById;
-
-  // Slot for our initial element with id "content"
-  var testNode;
-
-  function getCont() {
-    return fun.call(document, "content");
-  }
-  
-  function testClone() {
-    // Test to make sure that if we have multiple nodes with the same ID in
-    // a document we don't forget about one of them when the other is
-    // removed.
-    var newParent = $("display");
-    var node = testNode.cloneNode(true);
-    isnot(node, testNode, "Clone should be a different node");
-
-    newParent.appendChild(node);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 1");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 1");
-    
-    clear(newParent);
-    
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 2");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 2");
-
-    node = testNode.cloneNode(true);
-    newParent.appendChild(node);
-    testNode.parentNode.removeChild(testNode);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), node, "Should be getting clone pre-flush");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), node, "Should be getting clone post-flush");
-
-  }
-
-  function clear(node) {
-    while (node.hasChildNodes()) {
-      node.removeChild(node.firstChild);
-    }
-  }
-
-  // Actually run the test once the XML parser works incrementally
-  // addLoadEvent(testClone);
-  addLoadEvent(SimpleTest.finish);
-]]>
-</script>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <script class="testbody" type="text/javascript">
-  <![CDATA[
-    testNode = fun.call(document, "content");
-    // Needs incremental XML parser
-    todo(testNode != null, "Should have node here");
-  ]]>
-  </script>  
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug311681.xml b/testing/mochitest/tests/test_bug311681.xml
deleted file mode 100644
index 9e3dadedeca6..000000000000
--- a/testing/mochitest/tests/test_bug311681.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=311681
--->
-<head>
-  <title>Test for Bug 311681</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=311681">Mozilla Bug 311681</a>
-<script class="testbody" type="text/javascript">
-<![CDATA[
-  // Setup script
-  SimpleTest.waitForExplicitFinish();
-
-  // Make sure to trigger the hashtable case by asking for enough elements
-  // by ID.
-  for (var i = 0; i < 256; ++i) {
-    var x = document.getElementById(i);
-  }
-
-  // save off the document.getElementById function, since getting it as a
-  // property off the document it causes a content flush.      
-  var fun = document.getElementById;
-
-  // Slot for our initial element with id "content"
-  var testNode;
-
-  function getCont() {
-    return fun.call(document, "content");
-  }
-  
-  function testClone() {
-    // Test to make sure that if we have multiple nodes with the same ID in
-    // a document we don't forget about one of them when the other is
-    // removed.
-    var newParent = $("display");
-    var node = testNode.cloneNode(true);
-    isnot(node, testNode, "Clone should be a different node");
-
-    newParent.appendChild(node);
-
-    // Check what getElementById returns, no flushing
-    todo(getCont() == testNode, "Should be getting orig node pre-flush 1");
-    is(getCont(), node, "XML does it differently, for now");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    todo(getCont() == testNode, "Should be getting orig node post-flush 1");
-    is(getCont(), node, "XML does it differently, for now");
-    
-    clear(newParent);
-    
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 2");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 2");
-
-    node = testNode.cloneNode(true);
-    newParent.appendChild(node);
-    testNode.parentNode.removeChild(testNode);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), node, "Should be getting clone pre-flush");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), node, "Should be getting clone post-flush");
-
-  }
-
-  function clear(node) {
-    while (node.hasChildNodes()) {
-      node.removeChild(node.firstChild);
-    }
-  }
-
-  addLoadEvent(testClone);
-  addLoadEvent(SimpleTest.finish);
-]]>
-</script>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <script class="testbody" type="text/javascript">
-  <![CDATA[
-    testNode = fun.call(document, "content");
-    // Needs incremental XML parser
-    isnot(testNode, null, "Should have node here");
-  ]]>
-  </script>  
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug311681.xul b/testing/mochitest/tests/test_bug311681.xul
deleted file mode 100644
index 9c7f5af878da..000000000000
--- a/testing/mochitest/tests/test_bug311681.xul
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=311681
--->
-<window title="Mozilla Bug 311681"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <title>Test for Bug 311681</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=311681">Mozilla Bug 311681</a>
-<script class="testbody" type="text/javascript">
-<![CDATA[
-  // Setup script
-  SimpleTest.waitForExplicitFinish();
-
-  // Make sure to trigger the hashtable case by asking for enough elements
-  // by ID.
-  for (var i = 0; i < 256; ++i) {
-    var x = document.getElementById(i);
-  }
-
-  // save off the document.getElementById function, since getting it as a
-  // property off the document it causes a content flush.      
-  var fun = document.getElementById;
-
-  // Slot for our initial element with id "content"
-  var testNode;
-
-  function getCont() {
-    return fun.call(document, "content");
-  }
-  
-  function testClone() {
-    // Test to make sure that if we have multiple nodes with the same ID in
-    // a document we don't forget about one of them when the other is
-    // removed.
-    var newParent = $("display");
-    var node = testNode.cloneNode(true);
-    isnot(node, testNode, "Clone should be a different node");
-
-    newParent.appendChild(node);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 1");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 1");
-    
-    clear(newParent);
-    
-    // Check what getElementById returns, no flushing
-    is(getCont(), testNode, "Should be getting orig node pre-flush 2");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), testNode, "Should be getting orig node post-flush 2");
-
-    node = testNode.cloneNode(true);
-    newParent.appendChild(node);
-    testNode.parentNode.removeChild(testNode);
-
-    // Check what getElementById returns, no flushing
-    is(getCont(), node, "Should be getting clone pre-flush");
-    
-    // Trigger a layout flush, just in case.
-    var itemHeight = newParent.offsetHeight/10;
-
-    // Check what getElementById returns now.
-    is(getCont(), node, "Should be getting clone post-flush");
-
-  }
-
-  function clear(node) {
-    while (node.hasChildNodes()) {
-      node.removeChild(node.firstChild);
-    }
-  }
-
-  addLoadEvent(testClone);
-  addLoadEvent(SimpleTest.finish);
-]]>
-</script>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <script class="testbody" type="text/javascript">
-  <![CDATA[
-    testNode = fun.call(document, "content");
-    // Needs incremental XML parser
-    isnot(testNode, null, "Should have node here");
-  ]]>
-  </script>  
-</div>
-<pre id="test">
-</pre>
-</body>
-
-</window>
diff --git a/testing/mochitest/tests/test_bug319381.html b/testing/mochitest/tests/test_bug319381.html
deleted file mode 100644
index 8ed87f86363a..000000000000
--- a/testing/mochitest/tests/test_bug319381.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=319381
--->
-<head>
-  <title>Test for Bug 319381</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=319381">Mozilla Bug 319381</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <div id="t"></div>  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 319381 **/
-
-function c() {
-  return document.defaultView.getComputedStyle($('t'), "").
-    getPropertyValue("overflow");
-}
-
-function cval() {
-  return document.defaultView.getComputedStyle($('t'), "").
-    getPropertyCSSValue("overflow");
-}
-
-var vals = ["visible", "hidden", "auto", "scroll"];
-var mozVals = ["-moz-scrollbars-vertical", "-moz-scrollbars-horizontal"];
-var i, j;
-
-for (i = 0; i < vals.length; ++i) {
-  $('t').style.overflow = vals[i];
-  is($('t').style.overflow, vals[i], "Roundtrip");
-  is(c(), vals[i], "Simple property set");
-  isnot(cval(), null, "Simple property as CSSValue");
-}
-
-$('t').style.overflow = mozVals[0];
-is($('t').style.getPropertyValue("overflow-y"), "scroll", "Roundtrip");
-is($('t').style.getPropertyValue("overflow-x"), "hidden", "Roundtrip");
-is($('t').style.overflow, "", "Shorthand read directly");
-is(c(), "", "Shorthand computed");
-is(cval(), null, "Shorthand as CSSValue");
-
-$('t').style.overflow = mozVals[1];
-is($('t').style.getPropertyValue("overflow-x"), "scroll", "Roundtrip");
-is($('t').style.getPropertyValue("overflow-y"), "hidden", "Roundtrip");
-is($('t').style.overflow, "", "Shorthand read directly");
-is(c(), "", "Shorthand computed");
-is(cval(), null, "Shorthand as CSSValue");
-
-for (i = 0; i < vals.length; ++i) {
-  for (j = 0; j < vals.length; ++j) {
-    $('t').setAttribute("style",
-                        "overflow-x: " + vals[i] + "; overflow-y: " + vals[j]);
-    is($('t').style.getPropertyValue("overflow-x"), vals[i], "Roundtrip");
-    is($('t').style.getPropertyValue("overflow-y"), vals[j], "Roundtrip");
-
-    if (i == j) {
-      is($('t').style.overflow, vals[i], "Shorthand serialization");
-    } else {
-      is($('t').style.overflow, "", "Shorthand serialization");
-    }
-
-    // "visible" overflow-x and overflow-y become "auto" in computed style if
-    // the other direction is not also "visible".
-    if (i == j || (vals[i] == "visible" && vals[j] == "auto")) {
-      is(c(), vals[j], "Shorthand computation");
-      isnot(cval(), null, "Shorthand computation as CSSValue");
-    } else if (vals[j] == "visible" && vals[i] == "auto") {
-      is(c(), vals[i], "Shorthand computation");
-      isnot(cval(), null, "Shorthand computation as CSSValue");    
-    } else {
-      is(c(), "", "Shorthand computation");
-      is(cval(), null, "Shorthand computation as CSSValue");
-    }
-  }
-}
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug332848.xhtml b/testing/mochitest/tests/test_bug332848.xhtml
deleted file mode 100644
index 1087455867ff..000000000000
--- a/testing/mochitest/tests/test_bug332848.xhtml
+++ /dev/null
@@ -1,71 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=332848
--->
-<head>
-  <title>Test for Bug 332848</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=332848">Mozilla Bug 332848</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-<![CDATA[
-
-/** Test for Bug 332848 **/
-
-// parseChecker will become true if we keep parsing after calling close().
-var parseChecker = false;
-
-function test() {
-  try {
-    document.open();
-    is(0, 1, "document.open succeeded");
-  } catch (e) {
-    is (e.code, DOMException.NOT_SUPPORTED_ERR,
-        "Wrong exception from document.open");
-  }
-
-  try {
-    document.write("aaa");
-    is(0, 1, "document.write succeeded");
-  } catch (e) {
-    is (e.code, DOMException.NOT_SUPPORTED_ERR,
-        "Wrong exception from document.write");
-  }
-
-  try {
-    document.close();
-    is(0, 1, "document.close succeeded");
-  } catch (e) {
-    is (e.code, DOMException.NOT_SUPPORTED_ERR,
-        "Wrong exception from document.close");
-  }
-}
-
-function loadTest() {
-  is(parseChecker, true, "Parsing stopped");
-  test();
-  SimpleTest.finish();
-}
-
-window.onload = loadTest;
-
-SimpleTest.waitForExplicitFinish();
-
-test();
-]]>
-</script>
-<script>
-    parseChecker = true;
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug333983.html b/testing/mochitest/tests/test_bug333983.html
deleted file mode 100644
index 947ac1c73d91..000000000000
--- a/testing/mochitest/tests/test_bug333983.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=333983
--->
-<head>
-  <title>Test for Bug 333983</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=333983">Mozilla Bug 333983</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 333983 **/
-HTMLElement.prototype.foopy = function () { return "foopy"; }
-
-var foopy = "";
-try {
-  foopy = document.body.foopy()
-} catch (ex) {
-  foopy = ex + "";
-}
-
-is(foopy, "foopy", "HTMLElement.prototype functions work");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug3348.html b/testing/mochitest/tests/test_bug3348.html
deleted file mode 100644
index 19968c02da6a..000000000000
--- a/testing/mochitest/tests/test_bug3348.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=3348
--->
-<head>
-  <title>Test for Bug 3348</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=3348">Mozilla Bug 3348</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-<form id="form1">
-<input type="button" value="click here" onclick="buttonClick();">
-</form>
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 3348 **/
-
-var oForm = document.getElementById("form1");
-is(oForm.tagName, "FORM", "tagName of HTML element gives tag in upper case");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug337124.html b/testing/mochitest/tests/test_bug337124.html
deleted file mode 100644
index 99cc5c74159c..000000000000
--- a/testing/mochitest/tests/test_bug337124.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html><head>
-<title>Test for Bug 337124</title>
- <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=337124">Mozilla Bug 337124</a>
-
-<span style="display: table-row-group;">
-    <input type="text">
-  </span>
-  <div style="display: table-column-group;">
-    <script>document.body.offsetHeight;</script>
-  </div><span style="display: table-row-group;">
-          <input id="i1" type="text">
-        </span><fieldset id="f1" style="display: table-column-group;">
-               </fieldset>
-</fieldset>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var passed = false;
-if ( document.getElementById("f1").offsetTop >  document.getElementById("i1").offsetTop) {
-  passed = true;
-}
-
-ok(passed, "right layout order");
-
-</script> 
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/testing/mochitest/tests/test_bug337631.html b/testing/mochitest/tests/test_bug337631.html
deleted file mode 100644
index b8e7bc41596a..000000000000
--- a/testing/mochitest/tests/test_bug337631.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=337631
--->
-<head>
-  <title>Test for Bug 337631</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=337631">Mozilla Bug 337631</a>
-<p id="display"></p>
-<div id="content">
-  
-<a href="foo" id="test4">foo</a>
-<input id="test1" value="test">
-<p id="test2">adsf<a href="#" id="test3">asdf</a><input id="test5"></p>
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 337631 **/
-
-function getActiveElement()
-{
-  var rv;
-
-  var el = document.activeElement;
-  if (!el) {
-    rv = "none";
-    return rv;
-  }
-
-  if (el && el != document.documentElement) {
-    var nt;
-    try {
-      nt = el.nodeType;
-    } catch (e) {
-      rv = "[no permission]";
-      return rv;
-    }
-    if (!nt) {
-      rv = "[unknown]";
-    } else if (nt == 1) {
-      rv = el.tagName;
-    } else if (nt == 3) {
-      rv = "textnode"
-    } else {
-      rv = nt;
-    }
-
-    el = el.parentNode;
-    while (el && el != document.documentElement) {
-      rv += " in ";
-      try {
-        nt = el.nodeType;
-      } catch (e) {
-        rv += "[no permission]";
-        return rv;
-      }
-      if (!nt) {
-        rv += "[unknown]";
-      } else if (nt == 1) {
-        rv += el.tagName;
-      } else if (nt == 3) {
-        rv += "textnode"
-      } else {
-        rv += nt;
-      }
-
-      el = el.parentNode;
-    }
-  }
-
-  return rv;
-}
-
-$('test1').focus();
-is(getActiveElement(), "INPUT in DIV in BODY", "getActiveElement tests");
-
-$('test2').focus();
-is(getActiveElement(), "INPUT in DIV in BODY", "getActiveElement tests");
-
-$('test3').focus();
-is(getActiveElement(), "A in P in DIV in BODY", "getActiveElement tests");
-
-$('test4').focus();
-is(getActiveElement(), "A in DIV in BODY", "getActiveElement tests");
-
-$('test5').focus();
-is(getActiveElement(), "INPUT in P in DIV in BODY", "getActiveElement tests");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug338541.xhtml b/testing/mochitest/tests/test_bug338541.xhtml
deleted file mode 100644
index fb61249dc7fc..000000000000
--- a/testing/mochitest/tests/test_bug338541.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=338541
--->
-<head>
-  <title>Test for Bug 338541</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=338541">Mozilla Bug 338541</a>
-<p id="display"></p>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 338541 **/
-function getName(aNode, f)
-{
-  return (aNode ? aNode.nodeName : "(null)");
-}
-
-function walkDOM()
-{
-  var walker = document.createTreeWalker($('content'), Components.interfaces.nsIDOMNodeFilter.SHOW_ELEMENT, null, true);
-  var output = "";
-  while (walker.nextNode())
-  {
-    output += getName(walker.currentNode) + "\n";
-  }
-  output += "Final currentNode: " + getName(walker.currentNode);
-  is(output, "foo\nbar\nhtml:b\nqux\nbaz\nFinal currentNode: baz","treewalker returns correct nodeName");
-  SimpleTest.finish();
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(walkDOM, ok);
-
-</script>
-</pre>
-<div id="content" style="display: none">
-  <foo xmlns="http://example.com">
-     <bar><html:b xmlns:html="http://www.w3.org/1999/xhtml"><qux/></html:b>
-       <baz/>
-     </bar>
-  </foo>
-</div>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug338679.html b/testing/mochitest/tests/test_bug338679.html
deleted file mode 100644
index 9f76beb72801..000000000000
--- a/testing/mochitest/tests/test_bug338679.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=338679
--->
-<head>
-<title>Testcase bug 338679</title>
-<script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>
-    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=338679">Mozilla Bug 338679</a>
-<div >
-<dl>
-<dt>Actual result:</dt>
-<dd>
-    <pre id="out" style="width: 20em">
-    </pre>
-</dd>
-
-<dt>Expected result:</dt>
-
-<dd>
-    <pre>
-Previous:       width: 20em;
-New:            width: auto;
-    </pre>
-</dd>
-</dl>
-</div>
-<pre id="test">
-<script>
-
-/* This is our event handler function */
-function attr_modified(ev) {
-    $("out").textContent = "Previous:\t" + ev.prevValue + "\nNew:\t\t" + ev.newValue;
-    is(ev.newValue, "width: auto;", "DOMAttrModified event reports correct newValue");
-    todo(ev.prevValue == "width: 20em;", "DOMAttrModified event reports correct prevValue");
-    SimpleTest.finish(); // trigger the end of our test sequence
-}
-
-/* Call this to tell SimpleTest to wait for SimpleTest.finish() */
-SimpleTest.waitForExplicitFinish();
-
-$("out").addEventListener("DOMAttrModified", attr_modified, false);
-$("out").style.width = "auto";
-
-/* End of script, but SimpleTest will keep listening because 
-   we called waitForExplicitFinish() */
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug339350.xhtml b/testing/mochitest/tests/test_bug339350.xhtml
deleted file mode 100644
index e856e45e9188..000000000000
--- a/testing/mochitest/tests/test_bug339350.xhtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!-- 
-Tests by Sam Ruby - WTFPL License (http://sam.zoy.org/wtfpl/)
-
-http://www.intertwingly.net/blog/2006/10/03/Firefox-XHTML-innerHTML-quirk#comments
-https://bugzilla.mozilla.org/show_bug.cgi?id=339350
--->
-<head>
-  <!-- XHTML needs the packed version -->
-  <script type="text/javascript" src="../MochiKit/packed.js"/>      
-  <script type="text/javascript" src="SimpleTest/SimpleTest.js"/>   
-  <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-<body>
-<a  target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=339350">Mozilla Bug 339350</a>
-<div style="display: none">
-  <table border="1" cellspacing="0">
-  <thead>
-  <th></th>
-  <th>plain</th>
-  <th>brackets</th>
-  <th>braces</th>
-  </thead>
-
-  <tr>
-  <th>innerHTML</th>
-  <td><div id="i1"/></td>
-  <td style="background:yellow"><div id="i2"/></td>
-  <td><div id="i3"/></td>
-  </tr>
-  <tr>
-  <th>textNode</th>
-  <td><div id="t1"/></td>
-  <td><div id="t2"/></td>
-  <td><div id="t3"/></td>
-  </tr>
-  </table>
-</div>
-<pre id="test">
-<script type="text/javascript">
-var text1 = 'foo bar';
-var text2 = 'foo [bar]';
-var text3 = 'foo {bar}';
-
-<!-- This is the long way to write this stuff, 
-     you can use MochiKit functions too -->
-document.getElementById('i1').innerHTML = text1;
-document.getElementById('i2').innerHTML = text2;
-document.getElementById('i3').innerHTML = text3;
-
-document.getElementById('t1').appendChild(document.createTextNode(text1));
-document.getElementById('t2').appendChild(document.createTextNode(text2));
-document.getElementById('t3').appendChild(document.createTextNode(text3));
-
-<!-- The is() function is one way to add a test -->
-is(document.getElementById('i2').innerHTML, text2, "XHTML innerHTML with trailing brackets ']]'");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug339494.html b/testing/mochitest/tests/test_bug339494.html
deleted file mode 100644
index 5a65c21fa330..000000000000
--- a/testing/mochitest/tests/test_bug339494.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=339494
--->
-<head>
-  <title>Test for Bug 339494</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=339494">Mozilla Bug 339494</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <div id="d"></div>
-  <div id="s"></div>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-  /** Test for Bug 339494 **/
-
-  var d = document.getElementById("d");
-  
-  d.setAttribute("hhh", "testvalue");
-
-  document.addEventListener("DOMAttrModified", removeItAgain, false);
-  d.removeAttribute("hhh");
-  document.removeEventListener("DOMAttrModified", removeItAgain, false);
-
-  function removeItAgain()
-  {
-    ok(!d.hasAttribute("hhh"), "Value check 1",
-       "There should be no value");
-    isnot(d.getAttribute("hhh"), "testvalue", "Value check 2");
-    document.removeEventListener("DOMAttrModified", removeItAgain, false);
-    d.removeAttribute("hhh");
-    ok(true, "Reachability", "We shouldn't have crashed");
-  }
-  
-  var s = document.getElementById("s");
-  
-  s.setAttribute("ggg", "testvalue");
-
-  document.addEventListener("DOMAttrModified", compareVal, false);
-  s.setAttribute("ggg", "othervalue");
-  document.removeEventListener("DOMAttrModified", compareVal, false);
-
-  function compareVal()
-  {
-    ok(s.hasAttribute("ggg"), "Value check 3",
-       "There should be a value");
-    isnot(s.getAttribute("ggg"), "testvalue", "Value check 4");
-    is(s.getAttribute("ggg"), "othervalue", "Value check 5");
-  }
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug339494.xhtml b/testing/mochitest/tests/test_bug339494.xhtml
deleted file mode 100644
index 92894e607f8e..000000000000
--- a/testing/mochitest/tests/test_bug339494.xhtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=339494
--->
-<head>
-  <title>Test for Bug 339494</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=339494">Mozilla Bug 339494</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <div id="d" />
-  <div id="s" />
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 339494 **/
-
-  var d = document.getElementById("d");
-  
-  d.setAttribute("hhh", "testvalue");
-
-  document.addEventListener("DOMAttrModified", removeItAgain, false);
-  d.removeAttribute("hhh");
-  document.removeEventListener("DOMAttrModified", removeItAgain, false);
-
-  function removeItAgain()
-  {
-    ok(!d.hasAttribute("hhh"), "Value check 1",
-       "There should be no value");
-    isnot(d.getAttribute("hhh"), "testvalue", "Value check 2");
-    document.removeEventListener("DOMAttrModified", removeItAgain, false);
-    d.removeAttribute("hhh");
-    ok(true, "Reachability", "We shouldn't have crashed");
-  }
-  
-  var s = document.getElementById("s");
-  
-  s.setAttribute("ggg", "testvalue");
-
-  document.addEventListener("DOMAttrModified", compareVal, false);
-  s.setAttribute("ggg", "othervalue");
-  document.removeEventListener("DOMAttrModified", compareVal, false);
-
-  function compareVal()
-  {
-    ok(s.hasAttribute("ggg"), "Value check 3",
-       "There should be a value");
-    isnot(s.getAttribute("ggg"), "testvalue", "Value check 4");
-    is(s.getAttribute("ggg"), "othervalue", "Value check 5");
-  }
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug339494.xul b/testing/mochitest/tests/test_bug339494.xul
deleted file mode 100644
index e17c2927f84c..000000000000
--- a/testing/mochitest/tests/test_bug339494.xul
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=339494
--->
-<window title="Mozilla Bug 339494"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <title>Test for Bug 339494</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=339494">Mozilla Bug 339494</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <xul:hbox id="d"/>
-  <xul:hbox id="s"/>
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script class="testbody" type="application/javascript">
-
-/** Test for Bug 339494 **/
-
-  var d = document.getElementById("d");
-  
-  d.setAttribute("hhh", "testvalue");
-
-  document.addEventListener("DOMAttrModified", removeItAgain, false);
-  d.removeAttribute("hhh");
-  document.removeEventListener("DOMAttrModified", removeItAgain, false);
-
-  function removeItAgain()
-  {
-    ok(!d.hasAttribute("hhh"), "Value check 1",
-       "There should be no value");
-    isnot(d.getAttribute("hhh"), "testvalue", "Value check 2");
-    document.removeEventListener("DOMAttrModified", removeItAgain, false);
-    d.removeAttribute("hhh");
-    ok(true, "Reachability", "We shouldn't have crashed");
-  }
-  
-  var s = document.getElementById("s");
-  
-  s.setAttribute("ggg", "testvalue");
-
-  document.addEventListener("DOMAttrModified", compareVal, false);
-  s.setAttribute("ggg", "othervalue");
-  document.removeEventListener("DOMAttrModified", compareVal, false);
-
-  function compareVal()
-  {
-    ok(s.hasAttribute("ggg"), "Value check 3",
-       "There should be a value");
-    isnot(s.getAttribute("ggg"), "testvalue", "Value check 4");
-    is(s.getAttribute("ggg"), "othervalue", "Value check 5");
-  }
-
-</script>
-
-</window>
diff --git a/testing/mochitest/tests/test_bug340800.html b/testing/mochitest/tests/test_bug340800.html
deleted file mode 100644
index 163d3379e077..000000000000
--- a/testing/mochitest/tests/test_bug340800.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=340800
--->
-<head>
-  <title>Test for Bug 340800</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=340800">Mozilla Bug 340800</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <h1>iframe text/plain as DOM test</h1>
-
-  <div>
-
-  <iframe name="iframe1" width="100%" height="200"
-          src="/static/bug340800_iframe.txt"></iframe>
-  </div>
-
-  <div>
-  <h2>textarea with iframe content</h2>
-  <textarea rows="10" cols="80" id="textarea1"></textarea>
-  </div>
-
-  <div>
-  <h2>div with white-space: pre and iframe content</h2>
-  <div id="div1"></div>
-  </div>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 340800 **/
-function populateIframes () {
-  var iframe, iframeBody;
-  if ((iframe = window.frames.iframe1) && (iframeBody = iframe.document.body)) {
-    $('div1').innerHTML = iframeBody.innerHTML;
-    $('textarea1').value = iframeBody.innerHTML;
-  }
-  is($('div1').firstChild.tagName, "PRE", "innerHTML from txt iframe works with div");
-  ok($('textarea1').value.indexOf("<pre>") > -1, "innerHTML from txt iframe works with textarea.value");
-  SimpleTest.finish();
-}
-
-addLoadEvent(populateIframes);
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug342448.html b/testing/mochitest/tests/test_bug342448.html
deleted file mode 100644
index f77b1ff1270a..000000000000
--- a/testing/mochitest/tests/test_bug342448.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=342448
--->
-<head>
-  <title>Test for Bug 342448</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=342448">Mozilla Bug 342448</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 342448 **/
-SimpleTest.waitForExplicitFinish();
-try {
-setTimeout(1, 0);
-} catch (ex) {}
-callLater(.1, function() { ok(true, "crash when passing a number as the first arg to setTimeout"); SimpleTest.finish(); })
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug343596.html b/testing/mochitest/tests/test_bug343596.html
deleted file mode 100644
index 8ce10257a47d..000000000000
--- a/testing/mochitest/tests/test_bug343596.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=343596
--->
-<head>
-  <title>Test for Bug 343596</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=343596">Mozilla Bug 343596</a>
-<p id="display"></p>
-<script id="foo"></script>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 343596 **/
-
-SimpleTest.waitForExplicitFinish();
-
-try{
-  // Insert text into an empty script node that will cause a syntax error.
-  document.getElementById("foo").appendChild(document.createTextNode("("));
-}
-catch(ex){
-  // Note that this catch block does not execute.
-  ok(false, "this catch block should not execute");
-}
-
-setTimeout(function(){ok(true,"setTimeout still executes after bogus script insertion"); SimpleTest.finish();}, 200);
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug344830.html b/testing/mochitest/tests/test_bug344830.html
deleted file mode 100644
index b6647155659b..000000000000
--- a/testing/mochitest/tests/test_bug344830.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=344830
--->
-<head>
-  <title>Test for Bug 344830</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=344830">Mozilla Bug 344830</a>
-<p id="display"></p>
-<div id="content" style="display: block">
-  <embed name="svg1"
-         width="200" height="200"
-         type="image/svg+xml"
-         src="/static/bug344830_testembed.svg">
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 344830 **/
-function getSVG() {
- var embed = document.embeds["svg1"];
- var svgDocument = embed.getSVGDocument();
- var element = svgDocument.getElementById("g1");
- ok(embed, "document.embeds[] works with SVG");
- ok(svgDocument, "document.embeds[] works with SVG and embed.getSVGDocument()");
- ok(element, "document.embeds[] works with SVG and svgDocument.getElementById()");
- SimpleTest.finish();
-}
-addLoadEvent(getSVG);
-SimpleTest.waitForExplicitFinish()
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug344861.html b/testing/mochitest/tests/test_bug344861.html
deleted file mode 100644
index 264444d8edea..000000000000
--- a/testing/mochitest/tests/test_bug344861.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=344861
--->
-<head>
-  <title>Test for Bug 344861</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=344861">Mozilla Bug 344861</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 344861 **/
-SimpleTest.waitForExplicitFinish();
-
-var newwindow = window.open("/", "testwindow", "width=200,height=200");
-newwindow.onload = function() { 
-  is(newwindow.innerHeight, 200, "window.open has correct height dimensions");
-  is(newwindow.innerWidth, 200, "window.open has correct width dimensions");
-  SimpleTest.finish();
-  newwindow.close();
-}
-</script>
-</pre>
-</body>
-</html>
-
-   
diff --git a/testing/mochitest/tests/test_bug345521.html b/testing/mochitest/tests/test_bug345521.html
deleted file mode 100644
index 352c7e58ea57..000000000000
--- a/testing/mochitest/tests/test_bug345521.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=345521
--->
-<head>
-  <title>Test for Bug 345521</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=345521">Mozilla Bug 345521</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <a id="testlink" onclick="return 0">test</a><br />
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 345521 **/
-function hitlink() {
-  var evt = document.createEvent("MouseEvents");
-  evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-  var isOk = $("testlink").dispatchEvent(evt);
-  ok(isOk, "return 0 should not cancel an event");
-  SimpleTest.finish();
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(hitlink);
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug348497.html b/testing/mochitest/tests/test_bug348497.html
deleted file mode 100644
index ac8467b41dab..000000000000
--- a/testing/mochitest/tests/test_bug348497.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=348497
--->
-<head>
-  <title>Test for Bug 348497</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=348497">Mozilla Bug 348497</a>
-<p id="display"></p>
-<div id="content">
-  This page should not crash Mozilla<br>
-  <iframe id="testIframe"></iframe>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 348497 **/
-function doe() {
-    document.getElementById('testIframe').style.display = 'block';
-    document.getElementById('testIframe').contentDocument.designMode = 'on';
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(doe);
-addLoadEvent(function() { ok(true, "enabling designmode on an iframe onload does not crash Mozilla")});
-addLoadEvent(SimpleTest.finish);
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug351601.html b/testing/mochitest/tests/test_bug351601.html
deleted file mode 100644
index 3e3db1f2fa2a..000000000000
--- a/testing/mochitest/tests/test_bug351601.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=351601
--->
-<head>
-  <title>Test for Bug 351601</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=351601">Mozilla Bug 351601</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 351601 **/
-
-var foo;
-var isOK = false;
-try {
-  foo = navigator.buildID;
-  isOK = true;
-} catch (ex) { /* do not do anything here, as we are checking result below. */ }
-
-if (foo == "0000000000")
-  ok(isOK, "navigator.buildID should never throw");
-else
-  ok(isOK, "navigator.buildID is not 0000000000, but we can confirm the normal case does not crash.");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug352728.html b/testing/mochitest/tests/test_bug352728.html
deleted file mode 100644
index 06354fab4cc3..000000000000
--- a/testing/mochitest/tests/test_bug352728.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=352728
--->
-<head>
-  <title>Test for Bug 352728</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=352728">Mozilla Bug 352728</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-/** Test for Bug 352728 **/
-
-function checkTypes(aNode, aNodeType, aTypeArray)
-{
-  for (var i = 0; i < aTypeArray.length; ++i) {
-    ok(aNode instanceof aTypeArray[i], aNodeType + " type test " + i,
-       aNodeType + " should be a " + aTypeArray[i]);
-  }
-}
-
-function checkInterfaces(aNode, aNodeType, aInterfaceArray)
-{
-  for (var i = 0; i < aInterfaceArray.length; ++i) {
-    ok(aNode instanceof Components.interfaces[aInterfaceArray[i]],
-       aNodeType + " interface test " + i,
-       aNodeType + " should be a " + aInterfaceArray[i]);
-  }
-}
-
-function testCharacterData(aNode, aText)
-{
-  is(aNode.length, aText.length, "Text length should match");
-  is(aNode.data, aText, "Text content should match");
-  is(aNode.nodeValue, aText, "Check nodeValue");
-  is(aNode.localName, null, "Check localName")
-  is(aNode.namespaceURI, null, "Check namespaceURI");
-}
-
-function testComment(aText, aShouldSucceed)
-{
-  try {
-    var comment = document.createComment(aText);
-    var types = [ Comment, CharacterData, Node ];
-    checkTypes(comment, "comment", types);
-
-    var interfaces = [ "nsIDOMComment", "nsIDOMCharacterData", "nsIDOMNode",
-                       "nsIDOM3Node", "nsIDOMEventTarget" ];
-    checkInterfaces(comment, "comment", interfaces);
-
-    testCharacterData(comment, aText);
-    is(comment.nodeName, "#comment", "Check nodeName");
-    is(comment.nodeType, Node.COMMENT_NODE, "Check nodeType");
-
-    if (!aShouldSucceed) {
-      ok(0, "Invalid comment creation",
-         "Shouldn't create comment with embedded \"--\"");
-    }
-  } catch (e) {
-    if (aShouldSucceed) {
-      ok(0, "Correct functioning of comment stuff", "something broke: " + e);
-    } else {
-      is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
-    }
-  }
-}
-
-function testCDATASection(aText, aShouldSucceed)
-{
-  try {
-    var cdataSection = document.createCDATASection(aText);
-    ok(0, "Invalid CDATA section creation",
-       "Shouldn't create CDATA sections in HTML");
-  } catch (e) {
-    is(e.code, DOMException.NOT_SUPPORTED_ERR, "Check exception code");
-  }
-}
-
-function testPI(aTarget, aData, aShouldSucceed, aReason)
-{
-  try {
-    var pi = document.createProcessingInstruction(aTarget, aData);
-    ok(0, "Invalid processing instruction creation",
-       "Shouldn't create processing instructions in HTML");
-  } catch (e) {
-    is(e.code, DOMException.NOT_SUPPORTED_ERR, "Check exception code");
-  }
-}
-
-testComment("Some text", true);
-testComment("Some text with a '-' in it", true);
-testComment("Some text with a '-' and a '-' and another '-'", true);
-testComment("Some text -- this shouldn't create a node!", false);
-testComment("<!-- This is an HTML comment -->", false);
-
-testCDATASection("Some text", true);
-testCDATASection("Some text with a '?' in it", true);
-testCDATASection("Some text with a '>' in it", true);
-testCDATASection("Some text with a '?' and a '>' in it", true);
-testCDATASection("Some text with a '? >' in it", true);
-testCDATASection("Some text -- ?> this should be ok", true);
-testCDATASection("Some text ]]&gt; this should not create a node!", false);
-
-testPI("foo", "bar", true);
-testPI("foo:bar", "baz", true);
-testPI("foo", "bar?", true);
-testPI("foo", "bar>", true);
-testPI("foo", "bar? >", true);
-testPI("<aaa", "bar", false, "Target should not contain '<'");
-testPI("aaa>", "bar", false, "Target should not contain '>'");
-testPI("aa?", "bar", false, "Target should not contain '?'");
-testPI("foo", "bar?>", false, "Data should not contain '?>'");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug352728.xhtml b/testing/mochitest/tests/test_bug352728.xhtml
deleted file mode 100644
index f6676c8af36e..000000000000
--- a/testing/mochitest/tests/test_bug352728.xhtml
+++ /dev/null
@@ -1,195 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=352728
--->
-<head>
-  <title>Test for Bug 352728</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=352728">Mozilla Bug 352728</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<!-- First make sure that a script consisting of multiple CDATA sections is
-     even supported -->
-<script class="testbody" type="text/javascript">
-  var cdataTest1 = false;
-  var cdataTest2 = false;
-  var cdataTest3 = false;
-</script>
-
-<script class="testbody" type="text/javascript">
-<![CDATA[
-  cdataTest1 = true;
-]]>
-  cdataTest2 = true;
-<![CDATA[
-  cdataTest3 = true;
-]]>
-</script>
-
-<script class="testbody" type="text/javascript">
-  is(cdataTest1, true, "Check first CDATA section");
-  is(cdataTest2, true, "Check in between CDATA sections");
-  is(cdataTest3, true, "Check second CDATA section");
-</script>
-
-<script class="testbody" type="text/javascript">
-<![CDATA[
-
-/** Test for Bug 352728 **/
-function checkTypes(aNode, aNodeType, aTypeArray)
-{
-  for (var i = 0; i < aTypeArray.length; ++i) {
-    ok(aNode instanceof aTypeArray[i], aNodeType + " type test " + i,
-       aNodeType + " should be a " + aTypeArray[i]);
-  }
-}
-
-function checkInterfaces(aNode, aNodeType, aInterfaceArray)
-{
-  for (var i = 0; i < aInterfaceArray.length; ++i) {
-    ok(aNode instanceof Components.interfaces[aInterfaceArray[i]],
-       aNodeType + " interface test " + i,
-       aNodeType + " should be a " + aInterfaceArray[i]);
-  }
-}
-
-function testCharacterData(aNode, aText)
-{
-  is(aNode.length, aText.length, "Text length should match");
-  is(aNode.data, aText, "Text content should match");
-  is(aNode.nodeValue, aText, "Check nodeValue");
-  is(aNode.localName, null, "Check localName")
-  is(aNode.namespaceURI, null, "Check namespaceURI");
-}
-
-function testComment(aText, aShouldSucceed)
-{
-  try {
-    var comment = document.createComment(aText);
-    var types = [ Comment, CharacterData, Node ];
-    checkTypes(comment, "comment", types);
-
-    var interfaces = [ "nsIDOMComment", "nsIDOMCharacterData", "nsIDOMNode",
-                       "nsIDOM3Node", "nsIDOMEventTarget" ];
-    checkInterfaces(comment, "comment", interfaces);
-
-    testCharacterData(comment, aText);
-    is(comment.nodeName, "#comment", "Check nodeName");
-    is(comment.nodeType, Node.COMMENT_NODE, "Check nodeType");
-
-    if (!aShouldSucceed) {
-      ok(0, "Invalid comment creation",
-         "Shouldn't create comment with embedded \"--\"");
-    }
-  } catch (e) {
-    if (aShouldSucceed) {
-      ok(0, "Correct functioning of comment stuff", "something broke: " + e);
-    } else {
-      is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
-    }
-  }
-}
-
-function testCDATASection(aText, aShouldSucceed)
-{
-  try {
-    var cdataSection = document.createCDATASection(aText);
-    var types = [ CDATASection, CharacterData, Node ];
-    checkTypes(cdataSection, "CDATA section", types);
-
-    var interfaces = [ "nsIDOMCDATASection", "nsIDOMCharacterData",
-                       "nsIDOMNode", "nsIDOM3Node", "nsIDOMEventTarget" ];
-    checkInterfaces(cdataSection, "CDATA section", interfaces);
-
-    testCharacterData(cdataSection, aText);
-    is(cdataSection.nodeName, "#cdata-section", "Check nodeName");
-    is(cdataSection.nodeType, Node.CDATA_SECTION_NODE, "Check nodeType");
-
-    if (!aShouldSucceed) {
-      ok(0, "Invalid CDATA section creation",
-]]>
-         "Shouldn't create CDATA section with embedded \"]]&gt;\"");
-<![CDATA[
-    }
-  } catch (e) {
-    if (aShouldSucceed) {
-      ok(0, "Correct functioning of CDATA section stuff",
-         "something broke: " + e);
-    } else {
-      is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
-    }
-  }
-}
-
-function testPI(aTarget, aData, aShouldSucceed, aReason)
-{
-  try {
-    var pi = document.createProcessingInstruction(aTarget, aData);
-    var types = [ ProcessingInstruction, Node ];
-    checkTypes(pi, "processing instruction", types);
-
-    var interfaces = [ "nsIDOMProcessingInstruction", "nsIDOMNode",
-                       "nsIDOM3Node", "nsIDOMEventTarget" ];
-    checkInterfaces(pi, "processing instruction", interfaces);
-
-    is(pi.target, aTarget, "Check target");
-    is(pi.data, aData, "Check data");
-    is(pi.nodeName, aTarget, "Check nodeName");
-    is(pi.nodeValue, aData, "Check nodeValue");
-    is(pi.localName, null, "Check localName")
-    is(pi.namespaceURI, null, "Check namespaceURI");
-    
-    is(pi.nodeType, Node.PROCESSING_INSTRUCTION_NODE, "Check nodeType");
-
-    if (!aShouldSucceed) {
-      ok(0, "Invalid processing instruction creation", aReason);
-    }
-  } catch (e) {
-    if (aShouldSucceed) {
-      ok(0, "Correct functioning of processing instruction stuff",
-         "something broke: " + e);
-    } else {
-      is(e.code, DOMException.INVALID_CHARACTER_ERR, "Check exception code");
-    }
-  }
-}
-
-testComment("Some text", true);
-testComment("Some text with a '-' in it", true);
-testComment("Some text with a '-' and a '-' and another '-'", true);
-testComment("Some text -- this shouldn't create a node!", false);
-testComment("<!-- This is an HTML comment -->", false);
-
-testCDATASection("Some text", true);
-testCDATASection("Some text with a '?' in it", true);
-testCDATASection("Some text with a '>' in it", true);
-testCDATASection("Some text with a '?' and a '>' in it", true);
-testCDATASection("Some text with a '? >' in it", true);
-testCDATASection("Some text -- ?> this should be ok", true);
-]]>
-testCDATASection("Some text ]]&gt; this should not create a node!", false);
-
-<![CDATA[
-
-testPI("foo", "bar", true);
-testPI("foo:bar", "baz", true);
-testPI("foo", "bar?", true);
-testPI("foo", "bar>", true);
-testPI("foo", "bar? >", true);
-testPI("<aaa", "bar", false, "Target should not contain '<'");
-testPI("aaa>", "bar", false, "Target should not contain '>'");
-testPI("aa?", "bar", false, "Target should not contain '?'");
-testPI("foo", "bar?>", false, "Data should not contain '?>'");
-]]>
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug355026.html b/testing/mochitest/tests/test_bug355026.html
deleted file mode 100644
index 4ed74adf7bb1..000000000000
--- a/testing/mochitest/tests/test_bug355026.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-Test from Adam Guthrie.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=355026
--->
-<head>
-  <script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
-    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-
-<body>
-<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=355026">Mozilla Bug 355026</a>
-<div style="display: none" id="lengthtest">
-</div>
-<pre id="test">
-<script type="text/javascript">
-
-  var foo = document.createElement("div");
-  foo.appendChild(document.createElement("div"));
-  var children = foo.getElementsByTagName("div");
-
-  is(children.length, 1, "After appending a child div to a div, div.length should be 1.");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug357509.html b/testing/mochitest/tests/test_bug357509.html
deleted file mode 100644
index ee1d19b73d51..000000000000
--- a/testing/mochitest/tests/test_bug357509.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=357509
--->
-<head>
-    <script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
-    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-    <script>
-    function foo(elem) {
-      rng = document.createRange();
-      rng.setStartBefore(elem);
-    }
-    </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=357509">Mozilla Bug 357509</a>
-<div style="display: none" id="rangetest">
-</div>
-<pre id="test">
-<script type="text/javascript">
-var passed = false;
-try {
-  foo(document.getElementById("rangetest"))
-  passed = true;
-}
-catch (e) {
-  passed = false;
-}
-
-<!-- The ok() function tests the first arg -->
-ok(passed, "nsIDOMRange.setStartBefore");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug358660.html b/testing/mochitest/tests/test_bug358660.html
deleted file mode 100644
index 5efe3fcf26d4..000000000000
--- a/testing/mochitest/tests/test_bug358660.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=358660
--->
-<head>
-  <title>Test for Bug 358660</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=358660">Mozilla Bug 358660</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <iframe id="testframe"
-          src="data:text/html,<html><body>Some text</body></html>"></iframe>  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 358660 **/
-SimpleTest.waitForExplicitFinish();
-
-window.onload = function() {
-  var doc = $("testframe").contentDocument;
-  var range = doc.createRange();
-  range.selectNode(doc.documentElement);
-  is(range.toString(), "Some text", "Check text");
-
-  SimpleTest.finish()
-}
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug358797.html b/testing/mochitest/tests/test_bug358797.html
deleted file mode 100644
index 639e18c925a4..000000000000
--- a/testing/mochitest/tests/test_bug358797.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=358797
--->
-<head>
-  <title>Test for Bug 358797</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=358797">Mozilla Bug 358797</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 358797 **/
-
-var isOK = false;
-try {
-  var range;
-  range = document.createRange();
-  range.selectNode(document.firstChild);
-  range.createContextualFragment('<span></span>');
-}
-catch (ex) {
-  isOK = true;
-}
-ok(isOK, "range.createContextualFragment() should throw when range node is " +
-         "DocType");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/testing/mochitest/tests/test_bug359657.html b/testing/mochitest/tests/test_bug359657.html
deleted file mode 100644
index c72ec4b5ae9d..000000000000
--- a/testing/mochitest/tests/test_bug359657.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=359657
--->
-<head>
-  <title>Test for Bug 359657</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=359657">Mozilla Bug 359657</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 359657 **/
-function runTest() {
-  var span = document.createElement("span");
-  $("test").insertBefore(span, $("test").firstChild);
-  ok(true, "Reachability", "We should get here without crashing");
-  is($("test").firstChild, span, "First child is correct");
-}
-</script>
-<div>
-  <iframe src=""></iframe>
-  <!-- Important: This test needs to run async at this point.  The actual test
-       is not crashing while running this test! -->
-  <script type="text/javascript" src="data:text/javascript,runTest()"></script>
-</div>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug359754.xul b/testing/mochitest/tests/test_bug359754.xul
deleted file mode 100644
index 34c93d74a64d..000000000000
--- a/testing/mochitest/tests/test_bug359754.xul
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=359754
--->
-<window title="Mozilla Bug 359754"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
-  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=359754">Mozilla Bug 359754</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-</body>
-
-<description>
-  Displays a numberbox which ranges from 5 to 10.
-</description>
-
-<textbox id="foo" type="number" min="5" max="10"/>
-
-
-<script class="testbody" type="application/javascript">
-
-function hitIt() {
-  sendKey("up", "foo");
-}
-
-SimpleTest.waitForExplicitFinish();
-
-/** Test for Bug 359754 **/
-setTimeout('document.getElementById("foo").focus()', 0);
-addLoadEvent(function() {
-
-// pay attention to our key events
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-hitIt();
-is($("foo").value, "6", "value is now 6");
-
-hitIt();
-is($("foo").value, "7", "value is now 7");
-
-hitIt();
-is($("foo").value, "8", "value is now 8");
-
-hitIt();
-is($("foo").value, "9", "value is now 9");
-
-// now try to hit it past max
-hitIt();
-is($("foo").value, "10", "value is now 10");
-
-hitIt();
-is($("foo").value, "10", "value is now 10");
-
-hitIt();
-is($("foo").value, "10", "value is now 10");
-
-});
-
-addLoadEvent(SimpleTest.finish);
-</script>
-
-</window>
diff --git a/testing/mochitest/tests/test_bug360220.xul b/testing/mochitest/tests/test_bug360220.xul
deleted file mode 100644
index ec7007a04773..000000000000
--- a/testing/mochitest/tests/test_bug360220.xul
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=360220
--->
-<window title="Mozilla Bug 360220"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <title>Test for Bug 360220</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=360220">Mozilla Bug 360220</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<menulist id="menulist">
-  <menupopup>
-    <menuitem id="firstItem" label="foo" selected="true"/>
-    <menuitem id="secondItem" label="bar"/>
-  </menupopup>
-</menulist>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-/** Test for Bug 360220 **/
-
-var menulist = document.getElementById("menulist");
-var secondItem = document.getElementById("secondItem");
-menulist.selectedItem = secondItem;
-
-ok(menulist.label == "bar", "second item was not selected");
-secondItem.label = "new label";
-ok(menulist.label == "new label", "menulist label was not updated to the label of its selected item");
-]]>
-</script>
-
-</window>
diff --git a/testing/mochitest/tests/test_bug362391.xhtml b/testing/mochitest/tests/test_bug362391.xhtml
deleted file mode 100644
index 99948d8ab025..000000000000
--- a/testing/mochitest/tests/test_bug362391.xhtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:foobar="http://www.foobar.com">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=362391
--->
-<head>
-  <title>Test for Bug 362391</title>
-  <!-- XHTML needs explicit script elements -->
-  <script type="text/javascript" src="../MochiKit/Base.js"></script>
-  <script type="text/javascript" src="../MochiKit/Iter.js"></script>
-  <script type="text/javascript" src="../MochiKit/DOM.js"></script>
-  <script type="text/javascript" src="../MochiKit/Style.js"></script>
-  <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=362391">Mozilla Bug 362391</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<div id="test1"/>
-<div id="test2"/>
-<div id="test3" attr="null"/>
-<div id="test4" foobar:attr="http://www.foobar.com"/>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 362391 **/
-
-      var currentTest = 0;
-      var expected = "";
-      function listener(evt) {
-        var r = document.getElementById("result");
-        ++currentTest;
-        ok(((evt.relatedNode.namespaceURI + "") == expected),
-           evt.relatedNode.namespaceURI + " == "+ expected);
-      }
-
-      document.addEventListener("DOMAttrModified", listener, true);
-
-      function test() {
-        expected = "null";
-        document.getElementById("test1")
-          .setAttribute("attr", "null");
-
-        expected = "http://www.foobar.com";
-        document.getElementById("test2")
-          .setAttributeNS("http://www.foobar.com", "attr", "http://www.foobar.com");
-
-        expected = "http://www.foobar.com";
-        document.getElementById("test3")
-          .setAttributeNS("http://www.foobar.com", "attr", "http://www.foobar.com");
-
-        expected = "null";
-        document.getElementById("test4")
-          .setAttribute("attr", "null");
-
-        expected = "http://www.foobar.com";
-        document.getElementById("test3")
-          .removeAttributeNS("http://www.foobar.com", "attr");
-
-        expected = "null";
-        document.getElementById("test4")
-          .removeAttribute("attr");
-      }
-
-      test();
-</script>
-</pre>
-
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug364092.xhtml b/testing/mochitest/tests/test_bug364092.xhtml
deleted file mode 100644
index 7f493c2b2e58..000000000000
--- a/testing/mochitest/tests/test_bug364092.xhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=364092
--->
-<head>
-  <title>Test for Bug 364092</title>
-  <!-- XHTML needs explicit script elements -->
-  <script type="text/javascript" src="../MochiKit/Base.js"></script>
-  <script type="text/javascript" src="../MochiKit/Iter.js"></script>
-  <script type="text/javascript" src="../MochiKit/DOM.js"></script>
-  <script type="text/javascript" src="../MochiKit/Style.js"></script>
-  <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=364092">Mozilla Bug 364092</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<div id="test1" foo="foo"/>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-/** Test for Bug 364092 **/
-
-  var test1 = document.getElementById("test1");
-  var attrNode = test1.getAttributeNode("foo");
-  function mutationHandler(aEvent) {
-    ok(attrNode.isSameNode(aEvent.relatedNode));
-    ok(!test1.hasAttribute("foo"));
-  }
-
-  function runTest() {
-    test1.addEventListener("DOMAttrModified", mutationHandler, true);
-    test1.removeAttributeNode(attrNode);
-    test1.removeEventListener("DOMAttrModified", mutationHandler, true);
-  }
-
-   runTest();
-</script>
-</pre>
-
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug364413.xhtml b/testing/mochitest/tests/test_bug364413.xhtml
deleted file mode 100644
index 45864508680c..000000000000
--- a/testing/mochitest/tests/test_bug364413.xhtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:foobar="http://www.foobar.com">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=364413
--->
-<head>
-  <title>Test for Bug 364413</title>
-  <!-- XHTML needs explicit script elements -->
-  <script type="text/javascript" src="../MochiKit/Base.js"></script>
-  <script type="text/javascript" src="../MochiKit/Iter.js"></script>
-  <script type="text/javascript" src="../MochiKit/DOM.js"></script>
-  <script type="text/javascript" src="../MochiKit/Style.js"></script>
-  <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=364413">Mozilla Bug 364413</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<div id="test1" foobar:foo="foo"/>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-/** Test for Bug 364413 **/
-
-  var test1 = document.getElementById("test1");
-  var attrNode = test1.getAttributeNodeNS("http://www.foobar.com", "foo");
-  function mutationHandler(aEvent) {
-    ok(attrNode.isSameNode(aEvent.relatedNode));
-    ok(aEvent.target == attrNode.ownerElement);
-  }
-
-  function runTest() {
-    test1.removeAttributeNode(attrNode);
-    test1.addEventListener("DOMAttrModified", mutationHandler, true);
-    test1.setAttributeNodeNS(attrNode);
-    test1.removeEventListener("DOMAttrModified", mutationHandler, true);
-  }
-
-   runTest();
-</script>
-</pre>
-
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug365773.xul b/testing/mochitest/tests/test_bug365773.xul
deleted file mode 100644
index cbf6932e095d..000000000000
--- a/testing/mochitest/tests/test_bug365773.xul
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=365773
--->
-<window title="Mozilla Bug 365773"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <title>Test for Bug 365773</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=365773">Mozilla Bug 365773</a>
-<p id="display">
-  <radiogroup id="group" collapsed="true" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <radio id="item" label="Item"/>
-  </radiogroup>
-</p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-/** Test for Bug 365773 **/
-
-function selectItem(item, isIndex, testName) {
-  var exception = null;
-  try {
-    if (isIndex)
-      document.getElementById("group").selectedIndex = item;
-    else
-      document.getElementById("group").selectedItem = item;
-  }
-  catch(e) {
-    exception = e;
-  }
-
-  ok(exception == null, testName);
-}
-
-SimpleTest.waitForExplicitFinish();
-
-window.onload = function runTests() {
-  var item = document.getElementById("item");
-  
-  selectItem(item, false, "Radio button selected with selectedItem (not focused)");
-  selectItem(null, false, "Radio button deselected with selectedItem (not focused)");
-  selectItem(0, true, "Radio button selected with selectedIndex (not focused)");
-  selectItem(-1, true, "Radio button deselected with selectedIndex (not focused)");
-  
-  document.getElementById("group").focus();
-
-  selectItem(item, false, "Radio button selected with selectedItem (focused)");
-  selectItem(null, false, "Radio button deselected with selectedItem (focused)");
-  selectItem(0, true, "Radio button selected with selectedIndex (focused)");
-  selectItem(-1, true, "Radio button deselected with selectedIndex (focused)");
-
-  SimpleTest.finish();
-};
-]]>
-</script>
-
-</window>
diff --git a/testing/mochitest/tests/test_bug367164.html b/testing/mochitest/tests/test_bug367164.html
deleted file mode 100644
index daa074dc420b..000000000000
--- a/testing/mochitest/tests/test_bug367164.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=367164
--->
-<head>
-  <title>Test for Bug 367164</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=367164">Mozilla Bug 367164</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 367164 **/
-
-var span = document.createElement("span");
-
-var ins1 = false;
-var ins2 = false;
-var rem1 = false;
-var rem2 = false;
-
-span.addEventListener("DOMNodeInserted", function() { ins1 = true; }, true);
-span.addEventListener("DOMNodeInserted", function() { ins2 = true; }, false);
-span.addEventListener("DOMNodeRemoved", function() { rem1 = true; }, true);
-span.addEventListener("DOMNodeRemoved", function() { rem2 = true; }, false);
-
-$("content").appendChild(span);
-$("content").removeChild(span);
-
-is(ins1, true, "Capturing DOMNodeInserted listener");
-is(ins2, true, "Bubbling DOMNodeInserted listener");
-is(rem1, true, "Capturing DOMNodeRemoved listener");
-is(rem2, true, "Bubbling DOMNodeRemoved listener");
-  
-</script>
-
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug51034.html b/testing/mochitest/tests/test_bug51034.html
deleted file mode 100644
index dfd698fc2ffd..000000000000
--- a/testing/mochitest/tests/test_bug51034.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=51034
--->
-<head>
-  <title>Test for Bug 51034</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=51034">Mozilla Bug 51034</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <div id="divElement">
-   <span>Subelement1</span>
-   <span>Subelement2</span>
-   <span>Subelement3</span>
-  </div>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 51034 **/
-var x = document.getElementById('divElement');
-
-isOK = false;
-try {
-x.getElementsByTagName('span');
-isOK = true;
-} catch (ex) {
-  isOK = false;
-}
-
-ok(isOK, "getElementsByTagName() doesn't cause exception");
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug5141.html b/testing/mochitest/tests/test_bug5141.html
deleted file mode 100644
index 5013e86e7c23..000000000000
--- a/testing/mochitest/tests/test_bug5141.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=5141
--->
-<head>
-  <title>Test for Bug 5141</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=5141">Mozilla Bug 5141</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 5141 **/
-var baz = document.createElement('img');
-ok(baz.parentNode === null, "Node.parentNode should be null for standalone nodes");
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug589.html b/testing/mochitest/tests/test_bug589.html
deleted file mode 100644
index 79c9f427a545..000000000000
--- a/testing/mochitest/tests/test_bug589.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=589
--->
-<head>
-  <title>Test for Bug 589</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<style type="text/css">
-.letters {list-style-type: upper-alpha;}
-.numbers {list-style-type: decimal;}
-</style>
-
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=589">Mozilla Bug 589</a>
-<p id="display"></p>
-<div id="content" >
-
-<OL id="thelist" class="letters">
-<LI id="liA">This list should feature...
-<LI id="liB">...letters for each item...
-<LI id="li3" class="numbers">...except this one.
-</OL>
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 589 **/
-
-is(computedStyle($("liA"),"list-style-type"),"upper-alpha");
-is(computedStyle($("liB"),"list-style-type"),"upper-alpha");
-is(computedStyle($("li3"),"list-style-type"),"decimal");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug6296.html b/testing/mochitest/tests/test_bug6296.html
deleted file mode 100644
index 9ce38ef730c2..000000000000
--- a/testing/mochitest/tests/test_bug6296.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=6296
--->
-<head>
-  <title>Test for Bug 6296</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=6296">Mozilla Bug 6296</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <A HREF="../testdata/test.gif" id="foo" NAME="anchor1" ALT="this is a test of the image
-  attribute">Hi</A>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 6296 **/
-is($("foo").name, "anchor1", "accessing an anchor name should work, and not crash either!")
-
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug691.html b/testing/mochitest/tests/test_bug691.html
deleted file mode 100644
index 064608695b71..000000000000
--- a/testing/mochitest/tests/test_bug691.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=691
--->
-<head>
-  <title>Test for Bug 691</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-<script type="text/javascript">
-
-function show(what) {
-  var stage = document.getElementById("stage");
-  if (what == "modularity") {
-    var spaghetti = document.createElement("IMG",null);
-    spaghetti.setAttribute("SRC","/static/nnc_lockup.gif");
-    spaghetti.setAttribute("id","foo");
-    stage.insertBefore(spaghetti,stage.firstChild);
-  }
-}
-
-function remove() {
-  var stage = document.getElementById("stage");
-  var body = document.getElementsByTagName("BODY")[0];
-  while (stage.firstChild) {
-    stage.removeChild(stage.firstChild);
-  }
-}
-
-</script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=691">Mozilla Bug 691</a>
-<p id="display"></p>
-<div id="content" >
-<ul>
-<li >foo</li>   
-</ul>
-<div id="stage">
-</div>
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 691 **/
-
-show("modularity");
-remove();
-show("modularity");
-remove();
-show("modularity");
-remove();
-show("modularity");
-
-ok($("foo"), "basic DOM manipulation doesn't crash");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug694.html b/testing/mochitest/tests/test_bug694.html
deleted file mode 100644
index 0e0fc4b6bbd5..000000000000
--- a/testing/mochitest/tests/test_bug694.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=694
--->
-<head>
-  <title>Test for Bug 694</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=694">Mozilla Bug 694</a>
-<p id="display"></p>
-<div id="content" >
-<img src="/missing_on_purpose" width=123 height=25 alt="Hello, &quot;Quotes&quot; how are you?" id="testimg">  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 694 **/
-
-is($("testimg").getAttribute("alt"), "Hello, \"Quotes\" how are you?", "entities in alt attribute works");
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/testing/mochitest/tests/test_bug696.html b/testing/mochitest/tests/test_bug696.html
deleted file mode 100644
index 9493ab66e51e..000000000000
--- a/testing/mochitest/tests/test_bug696.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=696
--->
-<head>
-  <title>Test for Bug 696</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=696">Mozilla Bug 696</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <table><tr id="mytr"><td>Foo</td><td>Bar</td></tr></table>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 696 **/
-var mytr = $("content").getElementsByTagName("TR")[0];
-is(mytr.getAttribute("ID"),"mytr","TR tags expose their ID attribute");
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
index 7f6c4b0d01af..cbce17f3d3f3 100644
--- a/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
@@ -1170,7 +1170,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILocalFile **aResult)
     }
   }
 #elif defined(XP_UNIX)
-#if defined(NS_OSSO)
+#if defined(MOZ_PLATFORM_MAEMO)
     // As maemo does not follow the XDG "standard" (as usually desktop
     // Linux distros do) neither has a working $HOME/Desktop folder
     // for us to fallback into, "$HOME/MyDocs/.documents/" is the folder
diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js
index eaa4c6a1241c..9f93e8064734 100644
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -87,32 +87,27 @@ var PrintUtils = {
     }
   },
 
-  // calling PrintUtils.printPreview() requires that you have three functions
-  // in the global scope: getPPBrowser(), which returns the browser element in
-  // the window print preview uses, getNavToolbox(), which returns the element
-  // (usually the main toolbox element) before which the print preview toolbar
-  // should be inserted, and getWebNavigation(), which returns the document's
-  // nsIWebNavigation object
-  printPreview: function (aListenerOrEnterCallback, aExitCallback)
+  // If aCallback is not null, it must be an object which has the following methods:
+  // getPrintPreviewBrowser(), getSourceBrowser(),
+  // getNavToolbox(), onEnter() and onExit().
+  // If aCallback is null, then printPreview must previously have been called with
+  // non-null aCallback and that object will be reused.
+  printPreview: function (aCallback)
   {
-    // if we're already in PP mode, don't set the callbacks; chances
-    // are they're null because someone is calling printPreview() to
+    // if we're already in PP mode, don't set the callback; chances
+    // are it is null because someone is calling printPreview() to
     // get us to refresh the display.
     if (!document.getElementById("print-preview-toolbar")) {
-      if (typeof aListenerOrEnterCallback == "object") {
-        this._onEnterPP = function () { aListenerOrEnterCallback.onEnter(); };
-        this._onExitPP  = function () { aListenerOrEnterCallback.onExit(); };
-      } else {
-        this._onEnterPP = aListenerOrEnterCallback;
-        this._onExitPP  = aExitCallback;
-      }
+      this._callback = aCallback;
+      this._sourceBrowser = aCallback.getSourceBrowser();
+      this._originalTitle = this._sourceBrowser.contentDocument.title;
+      this._originalURL = this._sourceBrowser.currentURI.spec;
     } else {
       // collapse the browser here -- it will be shown in
-      // onEnterPrintPreview; this forces a reflow which fixes display
+      // enterPrintPreview; this forces a reflow which fixes display
       // issues in bug 267422.
-      var browser = getPPBrowser();
-      if (browser)
-        browser.collapsed = true;
+      this._sourceBrowser = this._callback.getPrintPreviewBrowser();
+      this._sourceBrowser.collapsed = true;
     }
 
     this._webProgressPP = {};
@@ -133,17 +128,16 @@ var PrintUtils = {
       PPROMPTSVC.showProgress(window, webBrowserPrint, printSettings, this._obsPP, false,
                               this._webProgressPP, ppParams, notifyOnOpen);
       if (ppParams.value) {
-        var webNav = getWebNavigation();
-        ppParams.value.docTitle = webNav.document.title;
-        ppParams.value.docURL   = webNav.currentURI.spec;
+        ppParams.value.docTitle = this._originalTitle;
+        ppParams.value.docURL   = this._originalURL;
       }
 
       // this tells us whether we should continue on with PP or 
       // wait for the callback via the observer
       if (!notifyOnOpen.value.valueOf() || this._webProgressPP.value == null)
-        this.enterPrintPreview(aWindow);
+        this.enterPrintPreview();
     } catch (e) {
-      this.enterPrintPreview(aWindow);
+      this.enterPrintPreview();
     }
   },
 
@@ -155,11 +149,7 @@ var PrintUtils = {
   },
 
   getPrintPreview: function() {
-    if (this._printPreviewTab) {
-      var docShell = getPPBrowser().getBrowserForTab(this._printPreviewTab).docShell;
-      return docShell.printPreview;
-    }
-    return null;
+    return this._callback.getPrintPreviewBrowser().docShell.printPreview;
   },
 
   ////////////////////////////////////////
@@ -202,11 +192,12 @@ var PrintUtils = {
     return printSettings;
   },
 
-  _originalZoomValue: null,
   _closeHandlerPP: null,
   _webProgressPP: null,
-  _onEnterPP: null,
-  _onExitPP: null,
+  _callback: null,
+  _sourceBrowser: null,
+  _originalTitle: "",
+  _originalURL: "",
 
   // This observer is called once the progress dialog has been "opened"
   _obsPP: 
@@ -227,44 +218,19 @@ var PrintUtils = {
     }
   },
 
-  _originalTab: null,
-  _printPreviewTab: null,
-
   enterPrintPreview: function ()
   {
     gFocusedElement = document.commandDispatcher.focusedElement;
 
-    // Reset the zoom value and save it to be restored later.
-    if (typeof ZoomManager == "object") {
-      this._originalZoomValue = ZoomManager.zoom;
-      ZoomManager.reset();
-    }
-
     var webBrowserPrint;
     var printSettings  = this.getPrintSettings();
-    var tabbrowser = getPPBrowser();
-    var contentWindow = null;
-    if (tabbrowser) {
-      if (this._printPreviewTab) {
-        contentWindow =
-          tabbrowser.getBrowserForTab(this._printPreviewTab).contentWindow;
-      } else {
-        this._originalTab = tabbrowser.mCurrentTab;
-        contentWindow = window.content
-        this._printPreviewTab = tabbrowser.loadOneTab("about:blank", null, null,
-                                                      null, true, false);
-      }
-    }
+    var originalWindow = this._sourceBrowser.contentWindow;
 
     try {
       webBrowserPrint = this.getPrintPreview();
-      webBrowserPrint.printPreview(printSettings, contentWindow,
+      webBrowserPrint.printPreview(printSettings, originalWindow,
                                    this._webProgressPP.value);
     } catch (e) {
-      this._printPreviewTab = null;
-      this._originalTab = null;
-      if (typeof ZoomManager == "object")
-        ZoomManager.zoom = this._originalZoomValue;
       // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
       // causing an exception to be thrown which we catch here.
       // Unfortunately this will also consume helpful failures, so add a
@@ -275,12 +241,9 @@ var PrintUtils = {
     var printPreviewTB = document.getElementById("print-preview-toolbar");
     if (printPreviewTB) {
       printPreviewTB.updateToolbar();
-      var browser = getPPBrowser();
-      if (browser)
-        browser.collapsed = false;
-
-      tabbrowser.getBrowserForTab(this._printPreviewTab).contentWindow.focus();
-      tabbrowser.selectedTab = this._printPreviewTab;
+      var browser = this._callback.getPrintPreviewBrowser();
+      browser.collapsed = false;
+      browser.contentWindow.focus();
       return;
     }
 
@@ -293,7 +256,7 @@ var PrintUtils = {
     printPreviewTB.id = "print-preview-toolbar";
     printPreviewTB.className = "toolbar-primary";
 
-    var navToolbox = getNavToolbox();
+    var navToolbox = this._callback.getNavToolbox();
     navToolbox.parentNode.insertBefore(printPreviewTB, navToolbox);
 
     // copy the window close handler
@@ -306,14 +269,12 @@ var PrintUtils = {
     // disable chrome shortcuts...
     window.addEventListener("keypress", this.onKeyPressPP, true);
 
-    tabbrowser.getBrowserForTab(this._printPreviewTab).contentWindow.focus();
-    tabbrowser.selectedTab = this._printPreviewTab;
+    var browser = this._callback.getPrintPreviewBrowser();
+    browser.collapsed = false;
+    browser.contentWindow.focus();
 
     // on Enter PP Call back
-    if (this._onEnterPP) {
-      this._onEnterPP();
-      this._onEnterPP = null;
-    }
+    this._callback.onEnter();
   },
 
   exitPrintPreview: function ()
@@ -324,23 +285,12 @@ var PrintUtils = {
     document.documentElement.setAttribute("onclose", this._closeHandlerPP);
     this._closeHandlerPP = null;
 
-    var webBrowserPrint = this.getWebBrowserPrint();
+    var webBrowserPrint = this.getPrintPreview();
     webBrowserPrint.exitPrintPreview();
 
-    var tabbrowser = getPPBrowser();
-    if (tabbrowser) {
-      tabbrowser.removeTab(this._printPreviewTab);
-      tabbrowser.selectedTab = this._originalTab;
-      this._originalTab = null;
-      this._printPreviewTab = null;
-    }
-
-    if (typeof ZoomManager == "object")
-      ZoomManager.zoom = this._originalZoomValue;
-
     // remove the print preview toolbar
     var printPreviewTB = document.getElementById("print-preview-toolbar");
-    getNavToolbox().parentNode.removeChild(printPreviewTB);
+    this._callback.getNavToolbox().parentNode.removeChild(printPreviewTB);
 
     var fm = Components.classes["@mozilla.org/focus-manager;1"]
                        .getService(Components.interfaces.nsIFocusManager);
@@ -350,11 +300,7 @@ var PrintUtils = {
       window.content.focus();
     gFocusedElement = null;
 
-    // on Exit PP Call back
-    if (this._onExitPP) {
-      this._onExitPP();
-      this._onExitPP = null;
-    }
+    this._callback.onExit();
   },
 
   onKeyPressPP: function (aEvent)
diff --git a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
index aa6817489b7a..7749abd035ef 100644
--- a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
@@ -23,6 +23,7 @@
  *   Tony Chang <tony@ponderer.org> (original author)
  *   Brett Wilson <brettw@gmail.com>
  *   Dave Camp <dcamp@mozilla.com>
+ *   David Dahl <ddahl@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -131,7 +132,7 @@ static const PRLogModuleInfo *gUrlClassifierDbServiceLog = nsnull;
 // want to change schema, or to recover from updating bugs.  When an
 // implementation version change is detected, the database is scrapped
 // and we start over.
-#define IMPLEMENTATION_VERSION 6
+#define IMPLEMENTATION_VERSION 7
 
 #define MAX_HOST_COMPONENTS 5
 #define MAX_PATH_COMPONENTS 4
@@ -2639,10 +2640,8 @@ nsUrlClassifierDBServiceWorker::SubChunk(PRUint32 tableId,
 
   LOG(("Subbing %d entries in chunk %d in table %d", entries.Length(), chunkNum, tableId));
 
-  nsAutoTArray<nsUrlClassifierEntry, 5> existingEntries;
-  nsUrlClassifierDomainHash lastKey;
-
   for (PRUint32 i = 0; i < entries.Length(); i++) {
+    nsAutoTArray<nsUrlClassifierEntry, 5> existingEntries;
     nsUrlClassifierEntry& thisEntry = entries[i];
 
     HandlePendingLookups();
@@ -2651,15 +2650,10 @@ nsUrlClassifierDBServiceWorker::SubChunk(PRUint32 tableId,
     PRBool haveAdds = (mCachedAddChunks.BinaryIndexOf(thisEntry.mAddChunkId) !=
                        mCachedAddChunks.NoIndex);
 
-    if (i == 0 || lastKey != thisEntry.mKey) {
-      existingEntries.Clear();
-      lastKey = thisEntry.mKey;
-
-      if (haveAdds) {
-        rv = mMainStore.ReadAddEntries(thisEntry.mKey, thisEntry.mTableId,
-                                       thisEntry.mAddChunkId, existingEntries);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
+    if (haveAdds) {
+      rv = mMainStore.ReadAddEntries(thisEntry.mKey, thisEntry.mTableId,
+                                     thisEntry.mAddChunkId, existingEntries);
+      NS_ENSURE_SUCCESS(rv, rv);
     }
 
     for (PRUint32 j = 0; j < existingEntries.Length(); j++) {
diff --git a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
index 54671ec876c1..deea9fab484a 100644
--- a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
+++ b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
@@ -188,7 +188,7 @@ checkUrls: function(urls, expected, cb)
     } else {
       cb();
     }
-  }
+  };
   doLookup();
 },
 
diff --git a/toolkit/components/url-classifier/tests/unit/test_addsub.js b/toolkit/components/url-classifier/tests/unit/test_addsub.js
index 7547e0b0b1a9..1303bd399ba4 100644
--- a/toolkit/components/url-classifier/tests/unit/test_addsub.js
+++ b/toolkit/components/url-classifier/tests/unit/test_addsub.js
@@ -287,6 +287,38 @@ function testSubsDifferentChunks() {
   doTest([subUpdate1, subUpdate2, addUpdate], assertions);
 }
 
+// for bug 534079
+function testSubsDifferentChunksSameHostId() {
+  var subUrls1 = [ "1:foo.com/a" ];
+  var subUrls2 = [ "1:foo.com/b", "2:foo.com/c" ];
+
+  var addUrls = [ "foo.com/a", "foo.com/b" ];
+  var addUrls2 = [ "foo.com/c" ];
+
+  var subUpdate1 = buildPhishingUpdate(
+    [{ "chunkNum" : 1,
+       "chunkType" : "s",
+       "urls": subUrls1 }]);
+  var subUpdate2 = buildPhishingUpdate(
+    [{ "chunkNum" : 2,
+       "chunkType" : "s",
+       "urls" : subUrls2 }]);
+
+  var addUpdate = buildPhishingUpdate(
+    [{ "chunkNum" : 1,
+       "urls" : addUrls }]);
+  var addUpdate2 = buildPhishingUpdate(
+    [{ "chunkNum" : 2,
+       "urls" : addUrls2 }]);
+
+  var assertions = {
+    "tableData" : "test-phish-simple;a:1-2:s:1-2",
+    "urlsDontExist" : [ "foo.com/c", "foo.com/b", "foo.com/a", ],
+  };
+
+  doTest([addUpdate, addUpdate2, subUpdate1, subUpdate2], assertions);
+}
+
 // Test lists of expired chunks
 function testExpireLists() {
   var addUpdate = buildPhishingUpdate(
@@ -446,6 +478,7 @@ function run_test()
     testSubPartiallyMatches,
     testSubPartiallyMatches2,
     testSubsDifferentChunks,
+    testSubsDifferentChunksSameHostId,
     testExpireLists,
     testDuplicateAddChunks,
     testExpireWholeSub,
diff --git a/toolkit/components/viewsource/content/viewPartialSource.xul b/toolkit/components/viewsource/content/viewPartialSource.xul
index ba10fbaf3d98..705c09458660 100644
--- a/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/toolkit/components/viewsource/content/viewPartialSource.xul
@@ -78,7 +78,7 @@
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
   <command id="cmd_print" oncommand="PrintUtils.print();"/>
-  <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(onEnterPP, onExitPP);"/>
+  <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(PrintPreviewListener);"/>
   <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
   <command id="cmd_close" oncommand="window.close();"/>
   <commandset id="editMenuCommands"/>
diff --git a/toolkit/components/viewsource/content/viewSource.js b/toolkit/components/viewsource/content/viewSource.js
index 2678b06d32fd..67e904a56f9d 100644
--- a/toolkit/components/viewsource/content/viewSource.js
+++ b/toolkit/components/viewsource/content/viewSource.js
@@ -383,26 +383,34 @@ function ViewSourceSavePage()
   saveURL(window.content.location.href.substring(12), null, "SaveLinkTitle");
 }
 
-function onEnterPP()
-{
-  var toolbox = document.getElementById("viewSource-toolbox");
-  toolbox.hidden = true;
-}
-
-function onExitPP()
-{
-  var toolbox = document.getElementById("viewSource-toolbox");
-  toolbox.hidden = false;
-}
-
-function getPPBrowser() {
-  return gBrowser;
-}
-
-// printUtils.js uses this
-function getNavToolbox()
-{
-  return document.getElementById("appcontent");
+var PrintPreviewListener = {
+  getPrintPreviewBrowser: function () {
+    var browser = document.getElementById("ppBrowser");
+    if (!browser) {
+      browser = document.createElement("browser");
+      browser.setAttribute("id", "ppBrowser");
+      browser.setAttribute("flex", "1");
+      document.getElementById("appcontent").
+        insertBefore(browser, document.getElementById("FindToolbar"));
+    }
+    return browser;
+  },
+  getSourceBrowser: function () {
+    return gBrowser;
+  },
+  getNavToolbox: function () {
+    return document.getElementById("appcontent");
+  },
+  onEnter: function () {
+    var toolbox = document.getElementById("viewSource-toolbox");
+    toolbox.hidden = true;
+    gBrowser.collapsed = true;
+  },
+  onExit: function () {
+    document.getElementById("ppBrowser").collapsed = true;
+    gBrowser.collapsed = false;
+    document.getElementById("viewSource-toolbox").hidden = false;
+  }
 }
 
 function getWebNavigation()
diff --git a/toolkit/components/viewsource/content/viewSource.xul b/toolkit/components/viewsource/content/viewSource.xul
index b132db8f1e0b..78ed8d8ba588 100644
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@@ -78,7 +78,7 @@
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
   <command id="cmd_print" oncommand="PrintUtils.print();"/>
-  <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(onEnterPP, onExitPP);"/>
+  <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(PrintPreviewListener);"/>
   <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
   <command id="cmd_close" oncommand="window.close();"/>
   <commandset id="editMenuCommands"/>
diff --git a/toolkit/content/widgets/notification.xml b/toolkit/content/widgets/notification.xml
index 98c32286131d..cb9a2e91e2e7 100644
--- a/toolkit/content/widgets/notification.xml
+++ b/toolkit/content/widgets/notification.xml
@@ -141,10 +141,11 @@
 
       <method name="removeNotification">
         <parameter name="aItem"/>
+        <parameter name="aSkipAnimation"/>
         <body>
           <![CDATA[
             if (aItem == this.currentNotification)
-              this.removeCurrentNotification();
+              this.removeCurrentNotification(aSkipAnimation);
             else if (aItem != this._closedNotification)
               this.removeChild(aItem);
             return aItem;
@@ -153,9 +154,10 @@
       </method>
 
       <method name="removeCurrentNotification">
+        <parameter name="aSkipAnimation"/>
         <body>
           <![CDATA[
-            this._showNotification(this.currentNotification, false);
+            this._showNotification(this.currentNotification, false, aSkipAnimation);
             return null;
           ]]>
         </body>
@@ -204,6 +206,7 @@
       <method name="_showNotification">
         <parameter name="aNotification"/>
         <parameter name="aSlideIn"/>
+        <parameter name="aSkipAnimation"/>
         <body>
           <![CDATA[
             if (this._timer) {
@@ -220,7 +223,7 @@
             }
 
             var height = aNotification.boxObject.height;
-            var skipAnimation = (height == 0);
+            var skipAnimation = aSkipAnimation || (height == 0);
             var change = height / this.slideSteps;
             var margin;
             if (aSlideIn) {
diff --git a/toolkit/crashreporter/CrashSubmit.jsm b/toolkit/crashreporter/CrashSubmit.jsm
new file mode 100644
index 000000000000..cf723de7ea18
--- /dev/null
+++ b/toolkit/crashreporter/CrashSubmit.jsm
@@ -0,0 +1,366 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    Ted Mielczarek <ted.mielczarek@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+let EXPORTED_SYMBOLS = [
+  "CrashSubmit"
+];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const STATE_START = Ci.nsIWebProgressListener.STATE_START;
+const STATE_STOP = Ci.nsIWebProgressListener.STATE_STOP;
+
+let reportURL = null;
+let strings = null;
+let myListener = null;
+
+function parseKeyValuePairs(text) {
+  var lines = text.split('\n');
+  var data = {};
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i] == '')
+      continue;
+
+    // can't just .split() because the value might contain = characters
+    let eq = lines[i].indexOf('=');
+    if (eq != -1) {
+      let [key, value] = [lines[i].substring(0, eq),
+                          lines[i].substring(eq + 1)];
+      if (key && value)
+        data[key] = value.replace("\\n", "\n", "g").replace("\\\\", "\\", "g");
+    }
+  }
+  return data;
+}
+
+function parseKeyValuePairsFromFile(file) {
+  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
+                createInstance(Ci.nsIFileInputStream);
+  fstream.init(file, -1, 0, 0);
+  var is = Cc["@mozilla.org/intl/converter-input-stream;1"].
+           createInstance(Ci.nsIConverterInputStream);
+  is.init(fstream, "UTF-8", 1024, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+  var str = {};
+  var contents = '';
+  while (is.readString(4096, str) != 0) {
+    contents += str.value;
+  }
+  is.close();
+  fstream.close();
+  return parseKeyValuePairs(contents);
+}
+
+function parseINIStrings(file) {
+  var factory = Cc["@mozilla.org/xpcom/ini-parser-factory;1"].
+                getService(Ci.nsIINIParserFactory);
+  var parser = factory.createINIParser(file);
+  var obj = {};
+  var en = parser.getKeys("Strings");
+  while (en.hasMore()) {
+    var key = en.getNext();
+    obj[key] = parser.getString("Strings", key);
+  }
+  return obj;
+}
+
+// Since we're basically re-implementing part of the crashreporter
+// client here, we'll just steal the strings we need from crashreporter.ini
+function getL10nStrings() {
+  let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+               getService(Ci.nsIProperties);
+  let path = dirSvc.get("GreD", Ci.nsIFile);
+  path.append("crashreporter.ini");
+  if (!path.exists()) {
+    // see if we're on a mac
+    path = path.parent;
+    path.append("crashreporter.app");
+    path.append("Contents");
+    path.append("MacOS");
+    path.append("crashreporter.ini");
+    if (!path.exists()) {
+      // very bad, but I don't know how to recover
+      return;
+    }
+  }
+  let crstrings = parseINIStrings(path);
+  strings = {
+    'crashid': crstrings.CrashID,
+    'reporturl': crstrings.CrashDetailsURL
+  };
+
+  path = dirSvc.get("XCurProcD", Ci.nsIFile);
+  path.append("crashreporter-override.ini");
+  if (path.exists()) {
+    crstrings = parseINIStrings(path);
+    if ('CrashID' in crstrings)
+      strings['crashid'] = crstrings.CrashID;
+    if ('CrashDetailsURL' in crstrings)
+      strings['reporturl'] = crstrings.CrashDetailsURL;
+  }
+}
+
+function getPendingMinidump(id) {
+  let directoryService = Cc["@mozilla.org/file/directory_service;1"].
+                         getService(Ci.nsIProperties);
+  let pendingDir = directoryService.get("UAppData", Ci.nsIFile);
+  pendingDir.append("Crash Reports");
+  pendingDir.append("pending");
+  let dump = pendingDir.clone();
+  let extra = pendingDir.clone();
+  dump.append(id + ".dmp");
+  extra.append(id + ".extra");
+  return [dump, extra];
+}
+
+function addFormEntry(doc, form, name, value) {
+  var input = doc.createElement("input");
+  input.type = "hidden";
+  input.name = name;
+  input.value = value;
+  form.appendChild(input);
+}
+
+function writeSubmittedReport(crashID, viewURL) {
+  let directoryService = Cc["@mozilla.org/file/directory_service;1"].
+                           getService(Ci.nsIProperties);
+  let reportFile = directoryService.get("UAppData", Ci.nsIFile);
+  reportFile.append("Crash Reports");
+  reportFile.append("submitted");
+  reportFile.append(crashID + ".txt");
+  var fstream = Cc["@mozilla.org/network/file-output-stream;1"].
+                createInstance(Ci.nsIFileOutputStream);
+  // open, write, truncate
+  fstream.init(reportFile, -1, -1, 0);
+  var os = Cc["@mozilla.org/intl/converter-output-stream;1"].
+           createInstance(Ci.nsIConverterOutputStream);
+  os.init(fstream, "UTF-8", 0, 0x0000);
+
+  var data = strings.crashid.replace("%s", crashID);
+  if (viewURL)
+     data += "\n" + strings.reporturl.replace("%s", viewURL);
+
+  os.writeString(data);
+  os.close();
+  fstream.close();
+}
+
+// the Submitter class represents an individual submission.
+function Submitter(id, element, submitSuccess, submitError) {
+  this.id = id;
+  this.element = element;
+  this.document = element.ownerDocument;
+  this.successCallback = submitSuccess;
+  this.errorCallback = submitError;
+}
+
+Submitter.prototype = {
+  submitSuccess: function Submitter_submitSuccess(ret)
+  {
+    if (!ret.CrashID) {
+      this.cleanup();
+      return;
+    }
+
+    // Write out the details file to submitted/
+    writeSubmittedReport(ret.CrashID, ret.ViewURL);
+
+    // Delete from pending dir
+    try {
+      this.dump.remove(false);
+      this.extra.remove(false);
+    }
+    catch (ex) {
+      // report an error? not much the user can do here.
+    }
+
+    if (this.successCallback)
+      this.successCallback(this.id, ret);
+    this.cleanup();
+  },
+
+  cleanup: function Submitter_cleanup() {
+    // drop some references just to be nice
+    this.element = null;
+    this.document = null;
+    this.successCallback = null;
+    this.errorCallback = null;
+    this.iframe = null;
+    this.dump = null;
+    this.extra = null;
+    // remove this object from the list of active submissions
+    let idx = CrashSubmit._activeSubmissions.indexOf(this);
+    if (idx != -1)
+      CrashSubmit._activeSubmissions.splice(idx, 1);
+  },
+
+  submitForm: function Submitter_submitForm()
+  {
+    let reportData = parseKeyValuePairsFromFile(this.extra);
+    let form = this.iframe.contentDocument.forms[0];
+    if ('ServerURL' in reportData) {
+      form.action = reportData.ServerURL;
+      delete reportData.ServerURL;
+    }
+    else {
+      return false;
+    }
+    // add the other data
+    for (let [name, value] in Iterator(reportData)) {
+      addFormEntry(this.iframe.contentDocument, form, name, value);
+    }
+    // tell the server not to throttle this, since it was manually submitted
+    addFormEntry(this.iframe.contentDocument, form, "Throttleable", "0");
+    // add the minidump
+    this.iframe.contentDocument.getElementById('minidump').value
+      = this.dump.path;
+    this.iframe.docShell.QueryInterface(Ci.nsIWebProgress);
+    this.iframe.docShell.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
+    form.submit();
+    return true;
+  },
+
+  // web progress listener
+  QueryInterface: function(aIID)
+  {
+    if (aIID.equals(Ci.nsIWebProgressListener) ||
+        aIID.equals(Ci.nsISupportsWeakReference) ||
+        aIID.equals(Ci.nsISupports))
+      return this;
+    throw Components.results.NS_NOINTERFACE;
+  },
+
+  onStateChange: function(aWebProgress, aRequest, aFlag, aStatus)
+  {
+    if(aFlag & STATE_STOP) {
+      this.iframe.docShell.removeProgressListener(this);
+
+      // check general request status first
+      if (!Components.isSuccessCode(aStatus)) {
+        this.element.removeChild(this.iframe);
+        if (this.errorCallback) {
+          this.errorCallback(this.id);
+          this.cleanup();
+        }
+        return 0;
+      }
+      // check HTTP status
+      if (aRequest instanceof Ci.nsIHttpChannel &&
+          aRequest.responseStatus != 200) {
+        this.element.removeChild(this.iframe);
+        if (this.errorCallback) {
+          this.errorCallback(this.id);
+          this.cleanup();
+        }
+        return 0;
+      }
+
+      var ret = parseKeyValuePairs(this.iframe.contentDocument.documentElement.textContent);
+      this.element.removeChild(this.iframe);
+      this.submitSuccess(ret);
+    }
+    return 0;
+  },
+
+  onLocationChange: function(aProgress, aRequest, aURI) {return 0;},
+  onProgressChange: function() {return 0;},
+  onStatusChange: function() {return 0;},
+  onSecurityChange: function() {return 0;},
+
+  submit: function Submitter_submit()
+  {
+    let [dump, extra] = getPendingMinidump(this.id);
+    if (!dump.exists() || !extra.exists())
+      return false;
+    this.dump = dump;
+    this.extra = extra;
+    let iframe = this.document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "iframe");
+    iframe.setAttribute("type", "content");
+
+    let self = this;
+    function loadHandler() {
+      if (iframe.contentWindow.location == "about:blank")
+        return;
+      iframe.removeEventListener("load", loadHandler, true);
+      self.submitForm();
+    }
+
+    iframe.addEventListener("load", loadHandler, true);
+    this.element.appendChild(iframe);
+    this.iframe = iframe;
+    iframe.webNavigation.loadURI("chrome://global/content/crash-submit-form.xhtml", 0, null, null, null);
+    return true;
+  }
+};
+
+//===================================
+// External API goes here
+let CrashSubmit = {
+  /**
+   * Submit the crash report named id.dmp from the "pending" directory.
+   *
+   * @param id
+   *        Filename (minus .dmp extension) of the minidump to submit.
+   * @param element
+   *        A DOM element to which an iframe can be appended as a child,
+   *        used for form submission.
+   * @param submitSuccess
+   *        A function that will be called if the report is submitted
+   *        successfully with two parameters: the id that was passed
+   *        to this function, and an object containing the key/value
+   *        data returned from the server in its properties.
+   * @param submitError
+   *        A function that will be called with one parameter if the
+   *        report fails to submit: the id that was passed to this
+   *        function.
+   *
+   * @return true if the submission began successfully, or false if
+   *         it failed for some reason. (If the dump file does not
+   *         exist, for example.)
+   */
+  submit: function CrashSubmit_submit(id, element, submitSuccess, submitError)
+  {
+    let submitter = new Submitter(id, element, submitSuccess, submitError);
+    CrashSubmit._activeSubmissions.push(submitter);
+    return submitter.submit();
+  },
+
+  // List of currently active submit objects
+  _activeSubmissions: []
+};
+
+// Run this when first loaded
+getL10nStrings();
\ No newline at end of file
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index 9ba5c2e580bb..48061bb297f5 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -111,6 +111,10 @@ CPPSRCS = \
 
 FORCE_STATIC_LIB = 1
 
+EXTRA_JS_MODULES = \
+  CrashSubmit.jsm \
+  $(NULL)
+
 ifdef ENABLE_TESTS
 TOOL_DIRS = test
 endif
diff --git a/toolkit/crashreporter/client/crashreporter_linux.cpp b/toolkit/crashreporter/client/crashreporter_linux.cpp
index 1adc262e687d..95062745747c 100644
--- a/toolkit/crashreporter/client/crashreporter_linux.cpp
+++ b/toolkit/crashreporter/client/crashreporter_linux.cpp
@@ -98,6 +98,11 @@ static const char kIniFile[] = "crashreporter.ini";
 
 static void LoadSettings()
 {
+  /*
+   * NOTE! This code needs to stay in sync with the preference checking
+   *       code in in nsExceptionHandler.cpp.
+   */
+
   StringTable settings;
   if (ReadStringsFromFile(gSettingsPath + "/" + kIniFile, settings, true)) {
     if (settings.find("Email") != settings.end()) {
@@ -125,6 +130,11 @@ static void LoadSettings()
 
 static void SaveSettings()
 {
+  /*
+   * NOTE! This code needs to stay in sync with the preference setting
+   *       code in in nsExceptionHandler.cpp.
+   */
+
   StringTable settings;
 
   ReadStringsFromFile(gSettingsPath + "/" + kIniFile, settings, true);
diff --git a/toolkit/crashreporter/client/crashreporter_win.cpp b/toolkit/crashreporter/client/crashreporter_win.cpp
index caccb402e8e7..f00c73537558 100644
--- a/toolkit/crashreporter/client/crashreporter_win.cpp
+++ b/toolkit/crashreporter/client/crashreporter_win.cpp
@@ -181,6 +181,10 @@ static bool CheckBoolKey(const wchar_t* key,
                          const wchar_t* valueName,
                          bool* enabled)
 {
+  /*
+   * NOTE! This code needs to stay in sync with the preference checking
+   *       code in in nsExceptionHandler.cpp.
+   */
   *enabled = false;
   bool found = false;
   HKEY hRegKey;
@@ -208,6 +212,10 @@ static bool CheckBoolKey(const wchar_t* key,
 
 static void SetBoolKey(const wchar_t* key, const wchar_t* value, bool enabled)
 {
+  /*
+   * NOTE! This code needs to stay in sync with the preference setting
+   *       code in in nsExceptionHandler.cpp.
+   */
   HKEY hRegKey;
 
   // remove the old value from the registry if it exists
diff --git a/toolkit/crashreporter/content/crashes.js b/toolkit/crashreporter/content/crashes.js
index b59df00e9b69..f1b6cfef9f45 100644
--- a/toolkit/crashreporter/content/crashes.js
+++ b/toolkit/crashreporter/content/crashes.js
@@ -1,150 +1,52 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    Dave Townsend <dtownsend@oxymoronical> (original author)
+ *    Ted Mielczarek <ted.mielczarek@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-var reportURL = null;
 var reportsDir, pendingDir;
-var strings = null;
-var myListener = null;
 
-function parseKeyValuePairs(text) {
-  var lines = text.split('\n');
-  var data = {};
-  for (let i = 0; i < lines.length; i++) {
-    if (lines[i] == '')
-      continue;
-
-    // can't just .split() because the value might contain = characters
-    let eq = lines[i].indexOf('=');
-    if (eq != -1) {
-      let [key, value] = [lines[i].substring(0, eq),
-                          lines[i].substring(eq + 1)];
-      if (key && value)
-        data[key] = value.replace("\\n", "\n", "g").replace("\\\\", "\\", "g");
-    }
-  }
-  return data;
-}
-
-function parseKeyValuePairsFromFile(file) {
-  var fstream = Cc["@mozilla.org/network/file-input-stream;1"].
-                createInstance(Ci.nsIFileInputStream);
-  fstream.init(file, -1, 0, 0);
-  var is = Cc["@mozilla.org/intl/converter-input-stream;1"].
-           createInstance(Ci.nsIConverterInputStream);
-  is.init(fstream, "UTF-8", 1024, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-  var str = {};
-  var contents = '';
-  while (is.readString(4096, str) != 0) {
-    contents += str.value;
-  }
-  is.close();
-  fstream.close();
-  return parseKeyValuePairs(contents);
-}
-
-function parseINIStrings(file) {
-  var factory = Cc["@mozilla.org/xpcom/ini-parser-factory;1"].
-                getService(Ci.nsIINIParserFactory);
-  var parser = factory.createINIParser(file);
-  var obj = {};
-  var en = parser.getKeys("Strings");
-  while (en.hasMore()) {
-    var key = en.getNext();
-    obj[key] = parser.getString("Strings", key);
-  }
-  return obj;
-}
-
-// Since we're basically re-implementing part of the crashreporter
-// client here, we'll just steal the strings we need from crashreporter.ini
-function getL10nStrings() {
-  let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
-               getService(Ci.nsIProperties);
-  let path = dirSvc.get("GreD", Ci.nsIFile);
-  path.append("crashreporter.ini");
-  if (!path.exists()) {
-    // see if we're on a mac
-    path = path.parent;
-    path.append("crashreporter.app");
-    path.append("Contents");
-    path.append("MacOS");
-    path.append("crashreporter.ini");
-    if (!path.exists()) {
-      // very bad, but I don't know how to recover
-      return;
-    }
-  }
-  let crstrings = parseINIStrings(path);
-  strings = {
-    'crashid': crstrings.CrashID,
-    'reporturl': crstrings.CrashDetailsURL
-  };
-
-  path = dirSvc.get("XCurProcD", Ci.nsIFile);
-  path.append("crashreporter-override.ini");
-  if (path.exists()) {
-    crstrings = parseINIStrings(path);
-    if ('CrashID' in crstrings)
-      strings['crashid'] = crstrings.CrashID;
-    if ('CrashDetailsURL' in crstrings)
-      strings['reporturl'] = crstrings.CrashDetailsURL;
-  }
-}
-
-function getPendingMinidump(id) {
-  let directoryService = Cc["@mozilla.org/file/directory_service;1"].
-                         getService(Ci.nsIProperties);
-  let dump = pendingDir.clone();
-  let extra = pendingDir.clone();
-  dump.append(id + ".dmp");
-  extra.append(id + ".extra");
-  return [dump, extra];
-}
-
-function addFormEntry(doc, form, name, value) {
-  var input = doc.createElement("input");
-  input.type = "hidden";
-  input.name = name;
-  input.value = value;
-  form.appendChild(input);
-}
-
-function writeSubmittedReport(crashID, viewURL) {
-  let reportFile = reportsDir.clone();
-  reportFile.append(crashID + ".txt");
-  var fstream = Cc["@mozilla.org/network/file-output-stream;1"].
-                createInstance(Ci.nsIFileOutputStream);
-  // open, write, truncate
-  fstream.init(reportFile, -1, -1, 0);
-  var os = Cc["@mozilla.org/intl/converter-output-stream;1"].
-           createInstance(Ci.nsIConverterOutputStream);
-  os.init(fstream, "UTF-8", 0, 0x0000);
-
-  var data = strings.crashid.replace("%s", crashID);
-  if (viewURL)
-     data += "\n" + strings.reporturl.replace("%s", viewURL);
-
-  os.writeString(data);
-  os.close();
-  fstream.close();
-}
-
-function submitSuccess(ret, link, dump, extra) {
-  if (!ret.CrashID)
-    return;
-  // Write out the details file to submitted/
-  writeSubmittedReport(ret.CrashID, ret.ViewURL);
-
-  // Delete from pending dir
-  try {
-    dump.remove(false);
-    extra.remove(false);
-  }
-  catch (ex) {
-    // report an error? not much the user can do here.
-  }
+Components.utils.import("resource://gre/modules/CrashSubmit.jsm");
 
+function submitSuccess(dumpid, ret) {
+  let link = document.getElementById(dumpid);
   if (link) {
+    link.className = "";
     // reset the link to point at our new crash report. this way, if the
     // user clicks "Back", the link will be correct.
     let CrashID = ret.CrashID;
@@ -158,105 +60,23 @@ function submitSuccess(ret, link, dump, extra) {
       window.location.href = reportURL + CrashID;
     }
   }
-  else {
-    window.close();
-  }
 }
 
-function submitForm(iframe, dump, extra, link)
-{
-  let reportData = parseKeyValuePairsFromFile(extra);
-  let form = iframe.contentDocument.forms[0];
-  if ('ServerURL' in reportData) {
-    form.action = reportData.ServerURL;
-    delete reportData.ServerURL;
-  }
-  else {
-    return false;
-  }
-  // add the other data
-  for (let [name, value] in Iterator(reportData)) {
-    addFormEntry(iframe.contentDocument, form, name, value);
-  }
-  // tell the server not to throttle this, since it was manually submitted
-  addFormEntry(iframe.contentDocument, form, "Throttleable", "0");
-  // add the minidump
-  iframe.contentDocument.getElementById('minidump').value = dump.path;
-
-  // web progress listener
-  const STATE_START = Ci.nsIWebProgressListener.STATE_START;
-  const STATE_STOP = Ci.nsIWebProgressListener.STATE_STOP;
-  myListener = {
-    QueryInterface: function(aIID) {
-      if (aIID.equals(Ci.nsIWebProgressListener) ||
-          aIID.equals(Ci.nsISupportsWeakReference) ||
-          aIID.equals(Ci.nsISupports))
-        return this;
-      throw Components.results.NS_NOINTERFACE;
-    },
-
-    onStateChange: function(aWebProgress, aRequest, aFlag, aStatus) {
-      if(aFlag & STATE_STOP) {
-        iframe.docShell.removeProgressListener(myListener);
-        myListener = null;
-	if (link)
-          link.className = "";
-
-        //XXX: give some indication of failure?
-        // check general request status first
-        if (!Components.isSuccessCode(aStatus)) {
-          document.body.removeChild(iframe);
-          return 0;
-        }
-        // check HTTP status
-        if (aRequest instanceof Ci.nsIHttpChannel &&
-            aRequest.responseStatus != 200) {
-          document.body.removeChild(iframe);
-          return 0;
-        }
-
-        var ret = parseKeyValuePairs(iframe.contentDocument.documentElement.textContent);
-        document.body.removeChild(iframe);
-        submitSuccess(ret, link, dump, extra);
-      }
-      return 0;
-    },
-
-    onLocationChange: function(aProgress, aRequest, aURI) {return 0;},
-    onProgressChange: function() {return 0;},
-    onStatusChange: function() {return 0;},
-    onSecurityChange: function() {return 0;},
-  };
-  iframe.docShell.QueryInterface(Ci.nsIWebProgress);
-  iframe.docShell.addProgressListener(myListener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
-  form.submit();
-  return true;
-}
-
-function createAndSubmitForm(id, link) {
-  let [dump, extra] = getPendingMinidump(id);
-  if (!dump.exists() || !extra.exists())
-    return false;
-  let iframe = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "iframe");
-  iframe.setAttribute("type", "content");
-
-  function loadHandler() {
-    if (iframe.contentWindow.location == "about:blank")
-      return;
-    iframe.removeEventListener("load", loadHandler, true);
-    submitForm(iframe, dump, extra, link);
-  }      
-
-  iframe.addEventListener("load", loadHandler, true);
-  document.body.appendChild(iframe);
-  iframe.webNavigation.loadURI("chrome://global/content/crash-submit-form.xhtml", 0, null, null, null);
-  return true;
+function submitError(dumpid) {
+  //XXX: do something more useful here
+  let link = document.getElementById(dumpid);
+  if (link)
+    link.className = "";
+  // dispatch an event, useful for testing
+  let event = document.createEvent("Events");
+  event.initEvent("CrashSubmitFailed", true, false);
+  document.dispatchEvent(event);
 }
 
 function submitPendingReport(event) {
   var link = event.target;
   var id = link.firstChild.textContent;
-  if (createAndSubmitForm(id, link))
+  if (CrashSubmit.submit(id, document.body, submitSuccess, submitError))
     link.className = "submitting";
   event.preventDefault();
   return false;
@@ -425,6 +245,5 @@ function clearReports() {
 }
 
 function init() {
-  getL10nStrings();
   populateReportList();
 }
diff --git a/toolkit/crashreporter/content/oopcrashdialog.js b/toolkit/crashreporter/content/oopcrashdialog.js
deleted file mode 100644
index 4de6ae47fdf4..000000000000
--- a/toolkit/crashreporter/content/oopcrashdialog.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// This code is TEMPORARY for submitting crashes via an ugly popup dialog:
-// bug 525849 tracks the real implementation.
-
-var id;
-
-function collectData() {
-  // HACK: crashes.js uses document.body, so we just alias it
-  document.body = document.getElementById('iframe-holder');
-
-  getL10nStrings();
-
-  let directoryService = Cc["@mozilla.org/file/directory_service;1"].
-    getService(Ci.nsIProperties);
-  pendingDir = directoryService.get("UAppData", Ci.nsIFile);
-  pendingDir.append("Crash Reports");
-  pendingDir.append("pending");
-  if (!pendingDir.exists())
-    pendingDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0770);
-
-  reportsDir = directoryService.get("UAppData", Ci.nsIFile);
-  reportsDir.append("Crash Reports");
-  reportsDir.append("submitted");
-  if (!reportsDir.exists())
-      reportsDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0770);
-
-  let dumpFile = window.arguments[0].QueryInterface(Ci.nsIFile);
-  let extraFile = dumpFile.clone();
-  id = dumpFile.leafName.replace(/.dmp$/, "");
-  extraFile.leafName = id + ".extra";
-  dumpFile.moveTo(pendingDir, "");
-  extraFile.moveTo(pendingDir, "");
-}
-
-function onSubmit()
-{
-  document.documentElement.getButton('accept').disabled = true;
-  document.documentElement.getButton('accept').label = 'Sending';
-  document.getElementById('throbber').src = 'chrome://global/skin/icons/loading_16.png';
-  createAndSubmitForm(id, null);
-  return false;
-}
diff --git a/toolkit/crashreporter/content/oopcrashdialog.xul b/toolkit/crashreporter/content/oopcrashdialog.xul
deleted file mode 100644
index 4180d30edf5e..000000000000
--- a/toolkit/crashreporter/content/oopcrashdialog.xul
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="oopCrashDialog"
-        buttons="accept,cancel"
-        buttonlabelaccept="Send"
-        ondialogaccept="return onSubmit()"
-        onload="collectData()">
-
-  <style xmlns="http://www.w3.org/1999/xhtml" type="text/css">
-    #iframe-holder {
-      visibility: hidden;
-      height: 1px;
-      overflow: hidden;
-    }
-  </style>
-
-  <script type="application/javascript;version=1.8" src="chrome://global/content/crashes.js"/>
-  <script type="application/javascript;version=1.8" src="chrome://global/content/oopcrashdialog.js"/>
-
-  <dialogheader title="A Plugin Crashed" />
-
-  <hbox align="center">
-    <description>A plugin crashed while Firefox was running. Please choose to send a crash report
-    to Mozilla. Reloading should cause your plugin to restart.</description>
-    <image width="16" height="16" id="throbber" />
-  </hbox>
-
-  <hbox id="iframe-holder" height="1"/>
-
-</dialog>
diff --git a/toolkit/crashreporter/jar.mn b/toolkit/crashreporter/jar.mn
index 54478c042855..5ccf6b7ea495 100644
--- a/toolkit/crashreporter/jar.mn
+++ b/toolkit/crashreporter/jar.mn
@@ -2,5 +2,3 @@ toolkit.jar:
   content/global/crashes.xhtml            (content/crashes.xhtml)
   content/global/crashes.js               (content/crashes.js)
   content/global/crash-submit-form.xhtml  (content/crash-submit-form.xhtml)
-  content/global/oopcrashdialog.xul       (content/oopcrashdialog.xul)
-  content/global/oopcrashdialog.js        (content/oopcrashdialog.js)
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
index f11e5afb9568..f679df0f247b 100644
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *  Josh Aas <josh@mozilla.com>
+ *  Justin Dolske <dolske@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -43,6 +44,7 @@
 #undef WIN32_LEAN_AND_MEAN
 #endif
 
+#include "nsIWindowsRegKey.h"
 #if defined(MOZ_IPC)
 #  include "client/windows/crash_generation/crash_generation_server.h"
 #endif
@@ -58,6 +60,9 @@
 #include <unistd.h>
 #include "mac_utils.h"
 #elif defined(XP_LINUX)
+#include "nsDirectoryServiceUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIINIParser.h"
 #if defined(MOZ_IPC)
 #  include "client/linux/crash_generation/client_info.h"
 #  include "client/linux/crash_generation/crash_generation_server.h"
@@ -88,6 +93,7 @@
 #include "nsDataHashtable.h"
 #include "nsInterfaceHashtable.h"
 #include "prprf.h"
+#include "nsIXULAppInfo.h"
 
 #if defined(MOZ_IPC)
 using google_breakpad::CrashGenerationServer;
@@ -95,10 +101,6 @@ using google_breakpad::ClientInfo;
 
 using mozilla::Mutex;
 using mozilla::MutexAutoLock;
-
-#include "nsThreadUtils.h"
-#include "nsIWindowWatcher.h"
-#include "nsIDOMWindow.h"
 #endif
 
 namespace CrashReporter {
@@ -966,34 +968,175 @@ nsresult AppendObjCExceptionInfoToAppNotes(void *inException)
 }
 #endif
 
-#if defined(MOZ_IPC)
-//-----------------------------------------------------------------------------
-// Out-of-process crash reporting API wrappers
-class SubmitCrashReport : public nsRunnable
+/*
+ * Combined code to get/set the crash reporter submission pref on
+ * different platforms.
+ */
+static nsresult PrefSubmitReports(PRBool* aSubmitReports, bool writePref)
 {
-public:
-  SubmitCrashReport(nsIFile* dumpFile) : mDumpFile(dumpFile) { }
+  nsresult rv;
+#if defined(XP_WIN32)
+  /*
+   * NOTE! This needs to stay in sync with the preference checking code
+   *       in toolkit/crashreporter/client/crashreporter_win.cpp
+   */
+  nsCOMPtr<nsIXULAppInfo> appinfo =
+    do_GetService("@mozilla.org/xre/app-info;1", &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  NS_IMETHOD Run() {
-    char* e = getenv("MOZ_CRASHREPORTER_NO_REPORT");
-    if (e && *e)
-      return NS_OK;
+  nsCAutoString appVendor, appName;
+  rv = appinfo->GetVendor(appVendor);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = appinfo->GetName(appName);
+  NS_ENSURE_SUCCESS(rv, rv);
 
-    nsCOMPtr<nsIWindowWatcher> windowWatcher =
-      do_GetService(NS_WINDOWWATCHER_CONTRACTID);
-    nsCOMPtr<nsIDOMWindow> newWindow;
-    windowWatcher->OpenWindow(nsnull,
-                              "chrome://global/content/oopcrashdialog.xul",
-                              "_blank",
-                              "centerscreen,chrome,titlebar",
-                              mDumpFile, getter_AddRefs(newWindow));
-    return NS_OK;
+  nsCOMPtr<nsIWindowsRegKey> regKey
+    (do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCAutoString regPath;
+
+  regPath.AppendLiteral("Software\\");
+  if(!appVendor.IsEmpty()) {
+    regPath.Append(appVendor);
+    regPath.AppendLiteral("\\");
+  }
+  regPath.Append(appName);
+  regPath.AppendLiteral("\\Crash Reporter");
+
+  // If we're saving the pref value, just write it to ROOT_KEY_CURRENT_USER
+  // and we're done.
+  if (writePref) {
+    rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
+                      NS_ConvertUTF8toUTF16(regPath),
+                      nsIWindowsRegKey::ACCESS_SET_VALUE);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    PRUint32 value = *aSubmitReports ? 1 : 0;
+    rv = regKey->WriteIntValue(NS_LITERAL_STRING("SubmitCrashReport"), value);
+    regKey->Close();
+    return rv;
   }
 
-private:
-  nsCOMPtr<nsIFile> mDumpFile;
-};
+  // We're reading the pref value, so we need to first look under
+  // ROOT_KEY_LOCAL_MACHINE to see if it's set there, and then fall back to
+  // ROOT_KEY_CURRENT_USER. If it's not set in either place, the pref defaults
+  // to "true".
+  PRUint32 value;
+  rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
+                    NS_ConvertUTF8toUTF16(regPath),
+                    nsIWindowsRegKey::ACCESS_QUERY_VALUE);
+  if (NS_SUCCEEDED(rv)) {
+    rv = regKey->ReadIntValue(NS_LITERAL_STRING("SubmitCrashReport"), &value);
+    regKey->Close();
+    if (NS_SUCCEEDED(rv)) {
+      *aSubmitReports = !!value;
+      return NS_OK;
+    }
+  }
 
+  rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
+                    NS_ConvertUTF8toUTF16(regPath),
+                    nsIWindowsRegKey::ACCESS_QUERY_VALUE);
+  if (NS_FAILED(rv)) {
+    *aSubmitReports = PR_TRUE;
+    return NS_OK;
+  }
+  
+  rv = regKey->ReadIntValue(NS_LITERAL_STRING("SubmitCrashReport"), &value);
+  // default to true on failure
+  if (NS_FAILED(rv)) {
+    value = 1;
+    rv = NS_OK;
+  }
+  regKey->Close();
+
+  *aSubmitReports = !!value;
+  return NS_OK;
+#elif defined(XP_MACOSX)
+  // TODO: Implement for OSX (bug 542379)
+  return NS_ERROR_NOT_IMPLEMENTED;
+#elif defined(XP_UNIX)
+  /*
+   * NOTE! This needs to stay in sync with the preference checking code
+   *       in toolkit/crashreporter/client/crashreporter_linux.cpp
+   */
+  nsCOMPtr<nsIFile> reporterINI;
+  rv = NS_GetSpecialDirectory("UAppData", getter_AddRefs(reporterINI));
+  NS_ENSURE_SUCCESS(rv, rv);
+  reporterINI->AppendNative(NS_LITERAL_CSTRING("Crash Reports"));
+  reporterINI->AppendNative(NS_LITERAL_CSTRING("crashreporter.ini"));
+
+  PRBool exists;
+  rv = reporterINI->Exists(&exists);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!exists) {
+    if (!writePref) {
+        // If reading the pref, default to true if .ini doesn't exist.
+        *aSubmitReports = PR_TRUE;
+        return NS_OK;
+    }
+    // Create the file so the INI processor can write to it.
+    rv = reporterINI->Create(nsIFile::NORMAL_FILE_TYPE, 0600);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  nsCOMPtr<nsIINIParserFactory> iniFactory =
+    do_GetService("@mozilla.org/xpcom/ini-processor-factory;1", &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(reporterINI);
+  NS_ENSURE_TRUE(localFile, NS_ERROR_FAILURE);
+  nsCOMPtr<nsIINIParser> iniParser;
+  rv = iniFactory->CreateINIParser(localFile,
+                                   getter_AddRefs(iniParser));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // If we're writing the pref, just set and we're done.
+  if (writePref) {
+    nsCOMPtr<nsIINIParserWriter> iniWriter = do_QueryInterface(iniParser);
+    NS_ENSURE_TRUE(iniWriter, NS_ERROR_FAILURE);
+
+    rv = iniWriter->SetString(NS_LITERAL_CSTRING("Crash Reporter"),
+                              NS_LITERAL_CSTRING("SubmitReport"),
+                              *aSubmitReports ?  NS_LITERAL_CSTRING("1") :
+                                                 NS_LITERAL_CSTRING("0"));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = iniWriter->WriteFile(NULL);
+    return rv;
+  }
+  
+  nsCAutoString submitReportValue;
+  rv = iniParser->GetString(NS_LITERAL_CSTRING("Crash Reporter"),
+                            NS_LITERAL_CSTRING("SubmitReport"),
+                            submitReportValue);
+
+  // Default to "true" if the pref can't be found.
+  if (NS_FAILED(rv))
+    *aSubmitReports = PR_TRUE;
+  else if (submitReportValue.EqualsASCII("0"))
+    *aSubmitReports = PR_FALSE;
+  else
+    *aSubmitReports = PR_TRUE;
+
+  return NS_OK;
+#else
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
+}
+
+nsresult GetSubmitReports(PRBool* aSubmitReports)
+{
+    return PrefSubmitReports(aSubmitReports, false);
+}
+
+nsresult SetSubmitReports(PRBool aSubmitReports)
+{
+    return PrefSubmitReports(&aSubmitReports, true);
+}
+
+
+#if defined(MOZ_IPC)
 static PLDHashOperator EnumerateChildAnnotations(const nsACString& key,
                                                  nsCString entry,
                                                  void* userData)
@@ -1025,6 +1168,25 @@ static PLDHashOperator EnumerateChildAnnotations(const nsACString& key,
   return PL_DHASH_NEXT;
 }
 
+static bool
+MoveToPending(nsIFile* dumpFile, nsIFile* extraFile)
+{
+  nsCOMPtr<nsIProperties> dirSvc
+    = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  if (!dirSvc)
+    return false;
+  nsCOMPtr<nsILocalFile> pendingDir;
+  if (NS_FAILED(dirSvc->Get("UAppData",
+                            NS_GET_IID(nsILocalFile),
+                            getter_AddRefs(pendingDir))) ||
+      NS_FAILED(pendingDir->Append(NS_LITERAL_STRING("Crash Reports"))) ||
+      NS_FAILED(pendingDir->Append(NS_LITERAL_STRING("pending"))))
+      return false;
+
+  return NS_FAILED(dumpFile->MoveTo(pendingDir, EmptyString())) ||
+    NS_FAILED(extraFile->MoveTo(pendingDir, EmptyString()));
+}
+
 static void
 OnChildProcessDumpRequested(void* aContext,
                             const ClientInfo* aClientInfo,
@@ -1084,13 +1246,18 @@ OnChildProcessDumpRequested(void* aContext,
   stream->Write("\n", 1, &written);
   stream->Close();
 
+  bool doReport = true;
+  char* e = getenv("MOZ_CRASHREPORTER_NO_REPORT");
+  if (e && *e)
+    doReport = false;
+
+  if (doReport)
+    MoveToPending(lf, extraFile);
+
   {
     MutexAutoLock lock(*dumpMapLock);
     pidToMinidump->Put(pid, lf);
   }
-
-  nsCOMPtr<nsIRunnable> r = new SubmitCrashReport(lf);
-  NS_DispatchToMainThread(r);
 }
 
 static bool
diff --git a/toolkit/crashreporter/nsExceptionHandler.h b/toolkit/crashreporter/nsExceptionHandler.h
index baf698f58152..2258e70470c5 100644
--- a/toolkit/crashreporter/nsExceptionHandler.h
+++ b/toolkit/crashreporter/nsExceptionHandler.h
@@ -70,6 +70,8 @@ nsresult SetupExtraData(nsILocalFile* aAppDataDirectory,
 #ifdef XP_MACOSX
   nsresult AppendObjCExceptionInfoToAppNotes(void *inException);
 #endif
+nsresult GetSubmitReports(PRBool* aSubmitReport);
+nsresult SetSubmitReports(PRBool aSubmitReport);
 
 #ifdef MOZ_IPC
 // Out-of-process crash reporter API.
diff --git a/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js b/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js
index e82a562e6f44..2480d4ea4660 100644
--- a/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js
+++ b/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js
@@ -53,7 +53,6 @@ function check_submit_pending(tab, crashes) {
   let CrashID = null;
   let CrashURL = null;
   function csp_onload() {
-    dump('csp_onload, location = ' + browser.contentWindow.location + '\n');
     if (browser.contentWindow.location != 'about:crashes') {
       browser.removeEventListener("load", csp_onload, true);
       // loaded the crash report page
@@ -90,6 +89,12 @@ function check_submit_pending(tab, crashes) {
                   });
     }
   }
+  function csp_fail() {
+    browser.removeEventListener("CrashSubmitFailed", csp_fail, true);
+    ok(false, "failed to submit crash report!");
+    cleanup_and_finish();
+  }
+  browser.addEventListener("CrashSubmitFailed", csp_fail, true);
   browser.addEventListener("load", csp_onload, true);
   function csp_pageshow() {
     browser.removeEventListener("pageshow", csp_pageshow, true);
@@ -107,13 +112,11 @@ function check_submit_pending(tab, crashes) {
   for each(let crash in crashes) {
     if (crash.pending) {
       SubmittedCrash = crash;
-      dump('check_submit_pending: trying to submit crash ' + crash.id + '\n');
       break;
     }
   }
   EventUtils.sendMouseEvent({type:'click'}, SubmittedCrash.id,
                             browser.contentWindow);
-  dump('check_submit_pending: sent mouse event to ' + SubmittedCrash.id + '\n');
 }
 
 function test() {
diff --git a/toolkit/crashreporter/test/browser/crashreport.sjs b/toolkit/crashreporter/test/browser/crashreport.sjs
index 1c0e483efe83..04c7e4288b54 100644
--- a/toolkit/crashreporter/test/browser/crashreport.sjs
+++ b/toolkit/crashreporter/test/browser/crashreport.sjs
@@ -145,7 +145,7 @@ function handleRequest(request, response)
   else if (request.method == "POST") {
     let formData = parseMultipartForm(request);
 
-    if ('upload_file_minidump' in formData) {
+    if (formData && 'upload_file_minidump' in formData) {
       response.setHeader("Content-Type", "text/plain", false);
 
       let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"]
@@ -161,6 +161,7 @@ function handleRequest(request, response)
       response.write("CrashID=" + uuid + "\n");
     }
     else {
+      dump('*** crashreport.sjs: Malformed request?\n');
       response.setStatusLine(request.httpVersion, 400, "Bad Request");
       response.write("Missing minidump file");
     }
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index a7db916e4e83..07f08ac5ba5f 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -177,7 +177,7 @@ EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CXXFLAGS	+= $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 	-framework SystemConfiguration \
 	-framework QuickTime \
 	-framework IOKit \
@@ -197,18 +197,14 @@ EXTRA_DSO_LDOPTS += \
 endif
 endif
 
-ifdef MOZ_PLATFORM_HILDON
-EXTRA_DSO_LDOPTS += $(LIBHILDONMIME_LIBS) $(LIBHILDONFM_LIBS)
+ifdef MOZ_PLATFORM_MAEMO
+EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif 
 
 ifdef MOZ_ENABLE_LIBCONIC
 EXTRA_DSO_LDOPTS += $(LIBCONIC_LIBS)
 endif
 
-ifdef NS_OSSO
-EXTRA_DSO_LDOPTS += $(LIBOSSO_LIBS)
-endif
-
 ifdef MOZ_ENABLE_DBUS
 EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
 endif
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index f36f74f6cf06..038f411dc7b9 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -365,7 +365,7 @@ COMPONENT_LIBS += gkdebug
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-EXTRA_DSO_LDOPTS += -framework OpenGL -lcups
+OS_LIBS += -framework OpenGL -lcups
 endif
 
 EXTRA_DSO_LDOPTS += \
diff --git a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
index 55d16746765b..ff95102e48cc 100644
--- a/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
@@ -23,3 +23,21 @@
 <!ENTITY missingPlugin.label                                 "Click here to download plugin.">
 <!ENTITY disabledPlugin.label                                "The plugin for this content has been disabled. Click here to manage your plugins.">
 <!ENTITY blockedPlugin.label                                 "This plugin has been blocked for your protection.">
+<!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
+<!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
+<!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
+<!ENTITY reloadPlugin.pre                                    "">
+<!ENTITY reloadPlugin.middle                                 "Reload the page">
+<!ENTITY reloadPlugin.post                                   " to try again.">
+<!-- LOCALIZATION NOTE (submittedCrashReport.pre): include a trailing space as needed -->
+<!-- LOCALIZATION NOTE (submittedCrashReport.middle): avoid leading/trailing spaces, this text is a link -->
+<!-- LOCALIZATION NOTE (submittedCrashReport.post): include a starting space as needed -->
+<!ENTITY submittedCrashReport.pre                            "A ">
+<!ENTITY submittedCrashReport.middle                         "crash report">
+<!ENTITY submittedCrashReport.post                           " was submitted.">
+<!-- LOCALIZATION NOTE (notSubmittedCrashReport.pre): include a trailing space as needed -->
+<!-- LOCALIZATION NOTE (notSubmittedCrashReport.middle): avoid leading/trailing spaces, this text is a link -->
+<!-- LOCALIZATION NOTE (notSubmittedCrashReport.post): include a starting space as needed -->
+<!ENTITY notSubmittedCrashReport.pre                         "You have disabled ">
+<!ENTITY notSubmittedCrashReport.middle                      "crash report">
+<!ENTITY notSubmittedCrashReport.post                        " submission.">
diff --git a/toolkit/mozapps/extensions/nsExtensionManager.js b/toolkit/mozapps/extensions/nsExtensionManager.js
index 25e7f532e733..0702537d85e5 100644
--- a/toolkit/mozapps/extensions/nsExtensionManager.js
+++ b/toolkit/mozapps/extensions/nsExtensionManager.js
@@ -2506,6 +2506,9 @@ ExtensionManager.prototype = {
       ERROR("Error flushing caches: " + e);
     }
 
+    // Reset the first run flag.
+    gFirstRun = false;
+
     return needsRestart;
   },
 
@@ -3179,6 +3182,7 @@ ExtensionManager.prototype = {
 
     var ds = this.datasource;
     var inactiveItemIDs = [];
+    var appEnabledItemIDs = [];
     var ctr = getContainer(ds, ds._itemRoot);
     var elements = ctr.GetElements();
     while (elements.hasMoreElements()) {
@@ -3189,6 +3193,8 @@ ExtensionManager.prototype = {
       if (appDisabled == "true" || appDisabled == OP_NEEDS_DISABLE ||
           userDisabled == "true" || userDisabled == OP_NEEDS_DISABLE)
         inactiveItemIDs.push(id);
+      if (appDisabled != "true" && appDisabled != OP_NEEDS_DISABLE)
+        appEnabledItemIDs.push(id);
     }
 
     if (isDirty)
@@ -3259,9 +3265,12 @@ ExtensionManager.prototype = {
         if (ds.getItemProperty(id, "appDisabled"))
           properties.appDisabled = null;
       }
-      else if (!ds.getItemProperty(id, "appDisabled")) {
-        properties.appDisabled = EM_L("true");
-        disabledAddons.push(id);
+      else {
+        if (!ds.getItemProperty(id, "appDisabled"))
+          properties.appDisabled = EM_L("true");
+        // If this item used to be app enabled then the upgrade has made it incompatible
+        if (appEnabledItemIDs.indexOf(id) >= 0)
+          disabledAddons.push(id);
       }
 
       ds.setItemProperties(id, properties);
@@ -3301,7 +3310,7 @@ ExtensionManager.prototype = {
 
     // Determine if we should check for compatibility updates when upgrading if
     // we have add-ons that aren't managed by the application.
-    if (!allAppManaged && !gFirstRun && disabledAddons.length > 0) {
+    if (!allAppManaged && !gFirstRun) {
       // Should we show a UI or just pass the list via a pref?
       if (getPref("getBoolPref", PREF_EM_SHOW_MISMATCH_UI, true)) {
         this._showMismatchWindow(inactiveItemIDs);
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug542391_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug542391_1/install.rdf
new file mode 100644
index 000000000000..7e4d57952a79
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug542391_1/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug542391_1@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>1</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Bug 542391 Test 1</em:name>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug542391_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug542391_2/install.rdf
new file mode 100644
index 000000000000..df73fa932fdc
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug542391_2/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug542391_2@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>2</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Bug 542391 Test 2</em:name>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug542391_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug542391_3/install.rdf
new file mode 100644
index 000000000000..05cb23d4532b
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug542391_3/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug542391_3@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>2</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Bug 542391 Test 3</em:name>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug542391_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug542391_4/install.rdf
new file mode 100644
index 000000000000..e13f63eb369d
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug542391_4/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug542391_4@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>3</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Bug 542391 Test 4</em:name>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug542391_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug542391_5/install.rdf
new file mode 100644
index 000000000000..e4e587cf70a7
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug542391_5/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug542391_5@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>3</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Bug 542391 Test 5</em:name>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/unit/head_extensionmanager.js b/toolkit/mozapps/extensions/test/unit/head_extensionmanager.js
index d036fced27d3..8775f840ac1a 100644
--- a/toolkit/mozapps/extensions/test/unit/head_extensionmanager.js
+++ b/toolkit/mozapps/extensions/test/unit/head_extensionmanager.js
@@ -50,6 +50,7 @@ const NS_INSTALL_LOCATION_APPPROFILE = "app-profile";
 const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
 const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
 
+var gXULAppInfo = null;
 var gEM = null;
 var gRDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                      .getService(Components.interfaces.nsIRDFService);
@@ -156,7 +157,7 @@ function do_get_addon(name)
  */
 function createAppInfo(id, name, version, platformVersion)
 {
-  var XULAppInfo = {
+  gXULAppInfo = {
     vendor: "Mozilla",
     name: name,
     ID: id,
@@ -184,7 +185,7 @@ function createAppInfo(id, name, version, platformVersion)
     createInstance: function (outer, iid) {
       if (outer != null)
         throw Components.results.NS_ERROR_NO_AGGREGATION;
-      return XULAppInfo.QueryInterface(iid);
+      return gXULAppInfo.QueryInterface(iid);
     }
   };
   var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
@@ -192,6 +193,26 @@ function createAppInfo(id, name, version, platformVersion)
                             XULAPPINFO_CONTRACTID, XULAppInfoFactory);
 }
 
+function startEM(upgraded) {
+  var needsRestart = false;
+  if (upgraded) {
+    try {
+      needsRestart = gEM.checkForMismatches();
+    }
+    catch (e) {
+      do_throw("checkForMismatches threw an exception: " + e + "\n");
+      needsRestart = false;
+      upgraded = false;
+    }
+  }
+
+  if (!upgraded || !needsRestart)
+    needsRestart = gEM.start();
+
+  if (needsRestart)
+    restartEM();
+}
+
 /**
  * This simulates an application startup. Since we will be starting from an
  * empty profile we follow that path.
@@ -206,19 +227,7 @@ function startupEM()
 
   // First run is a new profile which nsAppRunner would consider as an update
   // (no existing compatibility.ini)
-  var upgraded = true;
-  var needsRestart = false;
-  try {
-    needsRestart = gEM.checkForMismatches();
-  }
-  catch (e) {
-    dump("checkForMismatches threw an exception: " + e + "\n");
-    needsRestart = false;
-    upgraded = false;
-  }
-
-  if (!upgraded || !needsRestart)
-    needsRestart = gEM.start();
+  startEM(true);
 }
 
 /**
@@ -235,11 +244,15 @@ function shutdownEM()
  * Many operations require restarts to take effect. This function should
  * perform all that is necessary for this to happen.
  */
-function restartEM()
+function restartEM(newVersion)
 {
-  var needsRestart = gEM.start();
-  if (needsRestart)
-    gEM.start();
+  if (newVersion) {
+    gXULAppInfo.version = newVersion;
+    startEM(true);
+  }
+  else {
+    startEM(false);
+  }
 }
 
 var gDirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
diff --git a/toolkit/mozapps/extensions/test/unit/test_bug542391.js b/toolkit/mozapps/extensions/test/unit/test_bug542391.js
new file mode 100644
index 000000000000..24727c495f14
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/unit/test_bug542391.js
@@ -0,0 +1,271 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dave Townsend <dtownsend@oxymoronical.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+const URI_EXTENSION_UPDATE_DIALOG     = "chrome://mozapps/content/extensions/update.xul";
+const PREF_EM_DISABLED_ADDONS_LIST    = "extensions.disabledAddons";
+const PREF_EM_SHOW_MISMATCH_UI        = "extensions.showMismatchUI";
+
+// This will be called to show the blocklist message, we just make it look like
+// it was dismissed.
+var WindowWatcher = {
+  expected: false,
+  arguments: null,
+
+  openWindow: function(parent, url, name, features, arguments) {
+    do_check_eq(url, URI_EXTENSION_UPDATE_DIALOG);
+    do_check_true(this.expected);
+    this.expected = false;
+    this.arguments = arguments.QueryInterface(Ci.nsIVariant);
+  },
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Ci.nsIWindowWatcher)
+     || iid.equals(Ci.nsISupports))
+      return this;
+
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+var WindowWatcherFactory = {
+  createInstance: function createInstance(outer, iid) {
+    if (outer != null)
+      throw Components.results.NS_ERROR_NO_AGGREGATION;
+    return WindowWatcher.QueryInterface(iid);
+  }
+};
+
+var registrar = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"),
+                          "Fake Window Watcher",
+                          "@mozilla.org/embedcomp/window-watcher;1", WindowWatcherFactory);
+
+function isDisabled(id) {
+  return getManifestProperty(id, "isDisabled") == "true";
+}
+
+function appDisabled(id) {
+  return getManifestProperty(id, "appDisabled") == "true";
+}
+
+function userDisabled(id) {
+  return getManifestProperty(id, "userDisabled") == "true";
+}
+
+function check_state_v1() {
+  do_check_neq(gEM.getItemForID("bug542391_1@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_1@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_1@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_2@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_2@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_2@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_3@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_3@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_3@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_4@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_4@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_4@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_5@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_5@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_5@tests.mozilla.org"));
+}
+
+function check_state_v2() {
+  do_check_neq(gEM.getItemForID("bug542391_1@tests.mozilla.org"), null);
+  do_check_true(appDisabled("bug542391_1@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_1@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_2@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_2@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_2@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_3@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_3@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_3@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_4@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_4@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_4@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_5@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_5@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_5@tests.mozilla.org"));
+}
+
+function check_state_v3() {
+  do_check_neq(gEM.getItemForID("bug542391_1@tests.mozilla.org"), null);
+  do_check_true(appDisabled("bug542391_1@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_1@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_2@tests.mozilla.org"), null);
+  do_check_true(appDisabled("bug542391_2@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_2@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_3@tests.mozilla.org"), null);
+  do_check_true(appDisabled("bug542391_3@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_3@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_4@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_4@tests.mozilla.org"));
+  do_check_true(userDisabled("bug542391_4@tests.mozilla.org"));
+
+  do_check_neq(gEM.getItemForID("bug542391_5@tests.mozilla.org"), null);
+  do_check_false(appDisabled("bug542391_5@tests.mozilla.org"));
+  do_check_false(userDisabled("bug542391_5@tests.mozilla.org"));
+}
+
+// Install all the test add-ons, disable two of them and "upgrade" the app to
+// version 2 which will appDisable one.
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+  startupEM();
+
+  gEM.installItemFromFile(do_get_addon("test_bug542391_1"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+  gEM.installItemFromFile(do_get_addon("test_bug542391_2"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+  gEM.installItemFromFile(do_get_addon("test_bug542391_3"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+  gEM.installItemFromFile(do_get_addon("test_bug542391_4"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+  gEM.installItemFromFile(do_get_addon("test_bug542391_5"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+
+  restartEM();
+  gEM.disableItem("bug542391_2@tests.mozilla.org");
+  gEM.disableItem("bug542391_4@tests.mozilla.org");
+  restartEM();
+
+  check_state_v1();
+
+  WindowWatcher.expected = true;
+  restartEM("2");
+  do_check_false(WindowWatcher.expected);
+  check_state_v2();
+
+  run_test_1();
+}
+
+// Upgrade to version 3 which will appDisable two more add-ons. Check that the
+// 3 already disabled add-ons were passed to the mismatch dialog.
+function run_test_1() {
+  WindowWatcher.expected = true;
+  restartEM("3");
+  do_check_false(WindowWatcher.expected);
+  check_state_v3();
+  do_check_eq(WindowWatcher.arguments.length, 3);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_1@tests.mozilla.org") >= 0);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_2@tests.mozilla.org") >= 0);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_4@tests.mozilla.org") >= 0);
+
+  run_test_2();
+}
+
+// Downgrade to version 2 which will remove appDisable from two add-ons and
+// should pass all 4 previously disabled add-ons.
+function run_test_2() {
+  WindowWatcher.expected = true;
+  restartEM("2");
+  do_check_false(WindowWatcher.expected);
+  check_state_v2();
+  do_check_eq(WindowWatcher.arguments.length, 4);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_1@tests.mozilla.org") >= 0);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_2@tests.mozilla.org") >= 0);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_3@tests.mozilla.org") >= 0);
+  do_check_true(WindowWatcher.arguments.indexOf("bug542391_4@tests.mozilla.org") >= 0);
+
+  run_test_4();
+}
+
+// Upgrade to version 3 which will appDisable two more add-ons.
+function run_test_3() {
+  gPrefs.setBoolPref(PREF_EM_SHOW_MISMATCH_UI, false);
+
+  restartEM("3");
+  check_state_v3();
+  var disabled = [];
+  try {
+    gPrefs.getCharPref(PREF_EM_DISABLED_ADDONS_LIST).split(",");
+  }
+  catch (e) {}
+  do_check_eq(disabled.length, 2);
+  do_check_true(disabled.indexOf("bug542391_2@tests.mozilla.org") >= 0);
+  do_check_true(disabled.indexOf("bug542391_3@tests.mozilla.org") >= 0);
+  gPrefs.clearUserPref(PREF_EM_DISABLED_ADDONS_LIST);
+
+  run_test_2();
+}
+
+// Downgrade to version 2 which will remove appDisable from two add-ons.
+function run_test_4() {
+  restartEM("2");
+  check_state_v2();
+  var disabled = [];
+  try {
+    gPrefs.getCharPref(PREF_EM_DISABLED_ADDONS_LIST).split(",");
+  }
+  catch (e) {}
+  do_check_eq(disabled.length, 0);
+
+  finish_test();
+}
+
+function finish_test() {
+  gEM.uninstallItem("bug542391_1@tests.mozilla.org");
+  gEM.uninstallItem("bug542391_2@tests.mozilla.org");
+  gEM.uninstallItem("bug542391_3@tests.mozilla.org");
+  gEM.uninstallItem("bug542391_4@tests.mozilla.org");
+  gEM.uninstallItem("bug542391_5@tests.mozilla.org");
+
+  restartEM();
+  do_check_eq(gEM.getItemForID("bug542391_1@tests.mozilla.org"), null);
+  do_check_eq(gEM.getItemForID("bug542391_2@tests.mozilla.org"), null);
+  do_check_eq(gEM.getItemForID("bug542391_3@tests.mozilla.org"), null);
+  do_check_eq(gEM.getItemForID("bug542391_4@tests.mozilla.org"), null);
+  do_check_eq(gEM.getItemForID("bug542391_5@tests.mozilla.org"), null);
+}
diff --git a/toolkit/mozapps/jar.mn b/toolkit/mozapps/jar.mn
index ca27decc9b45..31a26ada7157 100644
--- a/toolkit/mozapps/jar.mn
+++ b/toolkit/mozapps/jar.mn
@@ -19,8 +19,8 @@ toolkit.jar:
   content/mozapps/plugins/pluginInstallerWizard.css             (plugins/content/pluginInstallerWizard.css)
   content/mozapps/plugins/pluginInstallerDatasource.js          (plugins/content/pluginInstallerDatasource.js)
   content/mozapps/plugins/pluginInstallerService.js             (plugins/content/pluginInstallerService.js)
-  content/mozapps/plugins/missingPlugin.xml                     (plugins/content/missingPlugin.xml)
-  content/mozapps/plugins/missingPluginBinding.css              (plugins/content/missingPluginBinding.css)
+  content/mozapps/plugins/pluginProblem.xml                     (plugins/content/pluginProblem.xml)
+  content/mozapps/plugins/pluginProblemBinding.css              (plugins/content/pluginProblemBinding.css)
   content/mozapps/handling/handler.css                          (handling/content/handler.css)
   content/mozapps/handling/handler.xml                          (handling/content/handler.xml)
   content/mozapps/handling/dialog.xul                           (handling/content/dialog.xul)
diff --git a/toolkit/mozapps/plugins/content/missingPlugin.xml b/toolkit/mozapps/plugins/content/missingPlugin.xml
deleted file mode 100644
index a3dfeb12cd8d..000000000000
--- a/toolkit/mozapps/plugins/content/missingPlugin.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is the Mozilla "puzzle piece" xbl binding.
-   -
-   - The Initial Developer of the Original Code is
-   - Christian Biesinger <cbiesinger@web.de>.
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<!DOCTYPE bindings SYSTEM "chrome://mozapps/locale/plugins/plugins.dtd">
-<bindings id="pluginBindings"
-              xmlns="http://www.mozilla.org/xbl"
-              xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-              xmlns:html="http://www.w3.org/1999/xhtml">
-  <binding id="missingPlugin" inheritstyle="false">
-    <resources>
-      <stylesheet src="chrome://mozapps/skin/plugins/missingPlugin.css"/>
-    </resources>
-
-    <content>
-      <!-- This uses html:a instead of something like a div so that it can be
-           tabbed to and just generically behaves more like something clickable
-           (i.e. for a11y reasons. see Bug 245349).
-        -->
-      <html:a href="#">
-        <xul:vbox>
-          <xul:image id="missingPluginPlaceholder"/>
-          <xul:description>&missingPlugin.label;</xul:description>
-        </xul:vbox>
-      </html:a>
-
-      <!-- Make our fallback content disappear (XBL requires this) -->
-      <html:div style="display:none;"><children/></html:div>
-    </content>
-
-    <handlers>
-      <handler event="click" button="0">
-        <![CDATA[
-          event.preventDefault();
-
-          // Fire a PluginNotFound event to trigger the infobar
-          var ev = document.createEvent("Events");
-          ev.initEvent("PluginNotFound", true, true);
-          this.dispatchEvent(ev);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-  
-  <binding id="disabledPlugin" inheritstyle="false">
-    <resources>
-      <stylesheet src="chrome://mozapps/skin/plugins/missingPlugin.css"/>
-    </resources>
-
-    <content>
-      <!-- This uses html:a instead of something like a div so that it can be
-           tabbed to and just generically behaves more like something clickable
-           (i.e. for a11y reasons. see Bug 245349).
-        -->
-      <html:a href="#">
-        <xul:vbox>
-          <xul:image id="disabledPluginPlaceholder"/>
-          <xul:description>&disabledPlugin.label;</xul:description>
-        </xul:vbox>
-      </html:a>
-
-      <!-- Make our fallback content disappear (XBL requires this) -->
-      <html:div style="display:none;"><children/></html:div>
-    </content>
-
-    <handlers>
-      <handler event="click" button="0">
-        <![CDATA[
-          event.preventDefault();
-
-          // Fire a PluginDisabled event to trigger the infobar
-          var ev = document.createEvent("Events");
-          ev.initEvent("PluginDisabled", true, true);
-          this.dispatchEvent(ev);
-        ]]>
-      </handler>
-    </handlers>
-  </binding>
-  
-  <binding id="blockedPlugin" inheritstyle="false">
-    <resources>
-      <stylesheet src="chrome://mozapps/skin/plugins/missingPlugin.css"/>
-    </resources>
-
-    <content>
-      <html:div>
-        <xul:vbox>
-          <xul:image id="blockedPluginPlaceholder"/>
-          <xul:description>&blockedPlugin.label;</xul:description>
-        </xul:vbox>
-      </html:div>
-
-      <!-- Make our fallback content disappear (XBL requires this) -->
-      <html:div style="display:none;"><children/></html:div>
-    </content>
-  </binding>
-  
-</bindings>
diff --git a/toolkit/mozapps/plugins/content/pluginProblem.xml b/toolkit/mozapps/plugins/content/pluginProblem.xml
new file mode 100644
index 000000000000..61852826bf52
--- /dev/null
+++ b/toolkit/mozapps/plugins/content/pluginProblem.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is the Mozilla "puzzle piece" xbl binding.
+   -
+   - The Initial Developer of the Original Code is
+   - Christian Biesinger <cbiesinger@web.de>.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   -   Justin Dolske <dolske@mozilla.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+<!DOCTYPE bindings SYSTEM "chrome://mozapps/locale/plugins/plugins.dtd">
+
+<bindings id="pluginBindings"
+              xmlns="http://www.mozilla.org/xbl"
+              xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+              xmlns:html="http://www.w3.org/1999/xhtml">
+<binding id="pluginProblem" inheritstyle="false">
+    <resources>
+        <stylesheet src="chrome://mozapps/skin/plugins/pluginProblem.css"/>
+    </resources>
+
+    <content>
+        <xul:vbox class="mainBox" role="link" flex="1">
+            <xul:spacer flex="1"/>
+            <xul:box class="icon"/>
+            <html:div class="msg msgUnsupported">&missingPlugin.label;</html:div>
+            <html:div class="msg msgDisabled">&disabledPlugin.label;</html:div>
+            <html:div class="msg msgBlocked">&blockedPlugin.label;</html:div>
+            <html:div class="msg msgCrashed"><!-- set at runtime --></html:div>
+            <html:div class="msg msgReload">&reloadPlugin.pre;<html:a class="reloadLink" href="">&reloadPlugin.middle;</html:a>&reloadPlugin.post;</html:div>
+            <xul:spacer flex="1"/>
+            <!-- link hrefs set at runtime -->
+            <html:div class="msg msgSubmitted">&submittedCrashReport.pre;<html:a class="submitLink" href="">&submittedCrashReport.middle;</html:a>&submittedCrashReport.post;</html:div>
+            <html:div class="msg msgNotSubmitted">&notSubmittedCrashReport.pre;<html:a class="notSubmitLink" href="">&notSubmittedCrashReport.middle;</html:a>&notSubmittedCrashReport.post;</html:div>
+        </xul:vbox>
+        <html:div style="display:none;"><children/></html:div>
+    </content>
+</binding>
+</bindings>
diff --git a/toolkit/mozapps/plugins/content/missingPluginBinding.css b/toolkit/mozapps/plugins/content/pluginProblemBinding.css
similarity index 74%
rename from toolkit/mozapps/plugins/content/missingPluginBinding.css
rename to toolkit/mozapps/plugins/content/pluginProblemBinding.css
index 62c11695832e..d28c90d44819 100644
--- a/toolkit/mozapps/plugins/content/missingPluginBinding.css
+++ b/toolkit/mozapps/plugins/content/pluginProblemBinding.css
@@ -20,6 +20,8 @@
  *
  * Contributor(s):
  *
+ *  Justin Dolske <dolske@mozilla.com>
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -36,17 +38,17 @@
 
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 
-embed:-moz-type-unsupported, applet:-moz-type-unsupported,
-object:-moz-has-handlerref:-moz-type-unsupported {
-  -moz-binding: url('chrome://mozapps/content/plugins/missingPlugin.xml#missingPlugin') !important;
-}
-
-embed:-moz-handler-disabled, applet:-moz-handler-disabled,
-object:-moz-has-handlerref:-moz-handler-disabled {
-  -moz-binding: url('chrome://mozapps/content/plugins/missingPlugin.xml#disabledPlugin') !important;
-}
-
-embed:-moz-handler-blocked, applet:-moz-handler-blocked,
-object:-moz-has-handlerref:-moz-handler-blocked {
-  -moz-binding: url('chrome://mozapps/content/plugins/missingPlugin.xml#blockedPlugin') !important;
+embed:-moz-type-unsupported,
+embed:-moz-handler-disabled,
+embed:-moz-handler-blocked,
+embed:-moz-handler-crashed,
+applet:-moz-type-unsupported,
+applet:-moz-handler-disabled,
+applet:-moz-handler-blocked,
+applet:-moz-handler-crashed,
+object:-moz-has-handlerref:-moz-type-unsupported,
+object:-moz-has-handlerref:-moz-handler-disabled,
+object:-moz-has-handlerref:-moz-handler-blocked,
+object:-moz-has-handlerref:-moz-handler-crashed {
+    -moz-binding: url('chrome://mozapps/content/plugins/pluginProblem.xml#pluginProblem') !important;
 }
diff --git a/toolkit/mozapps/plugins/pluginGlue.js b/toolkit/mozapps/plugins/pluginGlue.js
index 8a43a5090886..f5681d838774 100644
--- a/toolkit/mozapps/plugins/pluginGlue.js
+++ b/toolkit/mozapps/plugins/pluginGlue.js
@@ -43,7 +43,7 @@
 
 var module = {
     categoryEntry: "pluginfinder xbl binding",
-    categoryValue: "chrome://mozapps/content/plugins/missingPluginBinding.css",
+    categoryValue: "chrome://mozapps/content/plugins/pluginProblemBinding.css",
 
     // registerSelf: Register this component.
     registerSelf: function (compMgr, fileSpec, location, type) {
diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn
index be444ab249fb..c7bccebe4b68 100644
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -19,10 +19,12 @@ toolkit.jar:
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
   skin/classic/mozapps/passwordmgr/key.png                        (passwordmgr/key.png)
-  skin/classic/mozapps/plugins/missingPlugin.css                  (plugins/missingPlugin.css)
+  skin/classic/mozapps/plugins/pluginProblem.css                  (plugins/pluginProblem.css)
+  skin/classic/mozapps/plugins/backgroundStripes.png              (plugins/backgroundStripes.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginDisabled.png                 (plugins/pluginDisabled.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
+  skin/classic/mozapps/plugins/pluginCrashed.png                  (plugins/pluginCrashed.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png               (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/plugins/pluginBlocked-16.png               (plugins/pluginBlocked-16.png)
   skin/classic/mozapps/plugins/pluginOutdated-16.png              (plugins/pluginOutdated-16.png)
diff --git a/toolkit/themes/pinstripe/mozapps/plugins/backgroundStripes.png b/toolkit/themes/pinstripe/mozapps/plugins/backgroundStripes.png
new file mode 100644
index 000000000000..fca1c0228905
Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/plugins/backgroundStripes.png differ
diff --git a/toolkit/themes/pinstripe/mozapps/plugins/missingPlugin.css b/toolkit/themes/pinstripe/mozapps/plugins/missingPlugin.css
deleted file mode 100644
index b4b3ae3b8a90..000000000000
--- a/toolkit/themes/pinstripe/mozapps/plugins/missingPlugin.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file's style only applies to broken objects, not the rest
- * of the page.
- */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-html|object:not([width]), html|object[width=""],
-html|embed:not([width]), html|embed[width=""],
-html|applet:not([width]), html|applet[width=""] {
-  width: 240px;
-}
-
-html|object:not([height]), html|object[height=""],
-html|embed:not([height]), html|embed[height=""],
-html|applet:not([height]), html|applet[height=""] {
-  height: 200px;
-}
-
-html|object > *|*,
-html|embed > *|*,
-html|applet > *|* {
-  width: inherit;
-  height: inherit;
-}
-
-html|a, html|div {
-  display: inline-block;
-  /* overflow:hidden makes baseline vertical-alignment act like plugins */
-  overflow: hidden;
-  vertical-align: inherit;
-  border: 1px outset;
-  padding: 5px;
-  font-size: 12px;
-  font-family: sans-serif;
-  background: white;
-  -moz-user-select: none;
-  text-decoration: none;
-  color: black;
-}
-
-vbox {
-  width: inherit;
-  height: inherit;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-#missingPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
-}
-
-#disabledPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginDisabled.png);
-}
-
-#blockedPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked.png);
-}
-
-#missingPluginPlaceholder,
-#disabledPluginPlaceholder,
-#blockedPluginPlaceholder {
-  display: block;
-  border: 0px;
-  width: 32px;
-  height: 32px;
-}
diff --git a/toolkit/themes/pinstripe/mozapps/plugins/pluginCrashed.png b/toolkit/themes/pinstripe/mozapps/plugins/pluginCrashed.png
new file mode 100644
index 000000000000..89d3e91a995f
Binary files /dev/null and b/toolkit/themes/pinstripe/mozapps/plugins/pluginCrashed.png differ
diff --git a/toolkit/themes/pinstripe/mozapps/plugins/pluginProblem.css b/toolkit/themes/pinstripe/mozapps/plugins/pluginProblem.css
new file mode 100644
index 000000000000..99b885fba4c7
--- /dev/null
+++ b/toolkit/themes/pinstripe/mozapps/plugins/pluginProblem.css
@@ -0,0 +1,79 @@
+@namespace html url(http://www.w3.org/1999/xhtml);
+
+/* These styles affect only the bound element, not other page content. */
+
+html|object:not([width]), html|object[width=""],
+html|embed:not([width]), html|embed[width=""],
+html|applet:not([width]), html|applet[width=""] {
+    width: 240px;
+}
+
+html|object:not([height]), html|object[height=""],
+html|embed:not([height]), html|embed[height=""],
+html|applet:not([height]), html|applet[height=""] {
+    height: 200px;
+}
+
+.mainBox {
+    width: inherit;
+    height: inherit;
+    overflow: hidden;
+    text-align: center;
+
+    background-image: url(chrome://mozapps/skin/plugins/backgroundStripes.png);
+    -moz-border-radius: 12px;
+    /* recessed effect with dark inner shadow and lightened bottom */
+    -moz-box-shadow: inset 0 1px 5px rgba(0,0,0,0.8),
+                           0 1px 0 rgba(255,255,255,0.2);
+    padding: 5px;
+    -moz-user-select: none;
+}
+:-moz-type-unsupported .mainBox,
+:-moz-handler-disabled .mainBox,
+:-moz-handler-blocked .mainBox {
+    -moz-user-focus: normal;
+}
+:-moz-type-unsupported .mainBox:focus,
+:-moz-handler-disabled .mainBox:focus,
+:-moz-handler-blocked .mainBox:focus {
+    outline: 1px dotted;
+}
+
+.icon {
+    min-width: 48px;
+    min-height: 48px;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+:-moz-type-unsupported .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
+}
+:-moz-handler-disabled .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginDisabled.png);
+}
+:-moz-handler-blocked .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginBlocked.png);
+}
+:-moz-handler-crashed .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginCrashed.png);
+}
+
+.msg {
+    display: none;
+    color: white;
+    font: 12px sans-serif;
+    font-weight: bold;
+    cursor: default;
+    text-shadow: rgba(0,0,0,0.8) 0 0 5px;
+}
+:-moz-type-unsupported .msgUnsupported,
+:-moz-handler-disabled .msgDisabled,
+:-moz-handler-blocked .msgBlocked,
+:-moz-handler-crashed .msgCrashed,
+:-moz-handler-crashed .msgReload {
+    display: block;
+}
+
+html|A {
+    color: white;
+}
diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn
index aab51d6f6c85..9fe724610590 100644
--- a/toolkit/themes/winstripe/mozapps/jar.mn
+++ b/toolkit/themes/winstripe/mozapps/jar.mn
@@ -25,10 +25,12 @@ toolkit.jar:
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
         skin/classic/mozapps/places/tagContainerIcon.png           (places/tagContainerIcon.png)
 #endif
-        skin/classic/mozapps/plugins/missingPlugin.css             (plugins/missingPlugin.css)
+        skin/classic/mozapps/plugins/pluginProblem.css             (plugins/pluginProblem.css)
+        skin/classic/mozapps/plugins/backgroundStripes.png         (plugins/backgroundStripes.png)
         skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
         skin/classic/mozapps/plugins/pluginDisabled.png            (plugins/pluginDisabled.png)
         skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
+        skin/classic/mozapps/plugins/pluginCrashed.png             (plugins/pluginCrashed.png)
         skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
         skin/classic/mozapps/plugins/pluginBlocked-16.png          (plugins/pluginBlocked-16.png)
         skin/classic/mozapps/plugins/pluginOutdated-16.png         (plugins/pluginOutdated-16.png)
@@ -67,10 +69,12 @@ toolkit.jar:
         skin/classic/aero/mozapps/places/defaultFavicon.png                (places/defaultFavicon-aero.png)
         skin/classic/aero/mozapps/places/tagContainerIcon.png              (places/tagContainerIcon-aero.png)
 #endif
-        skin/classic/aero/mozapps/plugins/missingPlugin.css                (plugins/missingPlugin.css)
+        skin/classic/aero/mozapps/plugins/pluginProblem.css                (plugins/pluginProblem.css)
+        skin/classic/aero/mozapps/plugins/backgroundStripes.png            (plugins/backgroundStripes-aero.png)
         skin/classic/aero/mozapps/plugins/pluginGeneric.png                (plugins/pluginGeneric-aero.png)
         skin/classic/aero/mozapps/plugins/pluginDisabled.png               (plugins/pluginDisabled-aero.png)
         skin/classic/aero/mozapps/plugins/pluginBlocked.png                (plugins/pluginBlocked-aero.png)
+        skin/classic/aero/mozapps/plugins/pluginCrashed.png                (plugins/pluginCrashed-aero.png)
         skin/classic/aero/mozapps/plugins/pluginGeneric-16.png             (plugins/pluginGeneric-16-aero.png)
         skin/classic/aero/mozapps/plugins/pluginBlocked-16.png             (plugins/pluginBlocked-16-aero.png)
         skin/classic/aero/mozapps/plugins/pluginOutdated-16.png            (plugins/pluginOutdated-16-aero.png)
diff --git a/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes-aero.png b/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes-aero.png
new file mode 100644
index 000000000000..fca1c0228905
Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes-aero.png differ
diff --git a/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes.png b/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes.png
new file mode 100644
index 000000000000..fca1c0228905
Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/plugins/backgroundStripes.png differ
diff --git a/toolkit/themes/winstripe/mozapps/plugins/missingPlugin.css b/toolkit/themes/winstripe/mozapps/plugins/missingPlugin.css
deleted file mode 100644
index b4b3ae3b8a90..000000000000
--- a/toolkit/themes/winstripe/mozapps/plugins/missingPlugin.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file's style only applies to broken objects, not the rest
- * of the page.
- */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-html|object:not([width]), html|object[width=""],
-html|embed:not([width]), html|embed[width=""],
-html|applet:not([width]), html|applet[width=""] {
-  width: 240px;
-}
-
-html|object:not([height]), html|object[height=""],
-html|embed:not([height]), html|embed[height=""],
-html|applet:not([height]), html|applet[height=""] {
-  height: 200px;
-}
-
-html|object > *|*,
-html|embed > *|*,
-html|applet > *|* {
-  width: inherit;
-  height: inherit;
-}
-
-html|a, html|div {
-  display: inline-block;
-  /* overflow:hidden makes baseline vertical-alignment act like plugins */
-  overflow: hidden;
-  vertical-align: inherit;
-  border: 1px outset;
-  padding: 5px;
-  font-size: 12px;
-  font-family: sans-serif;
-  background: white;
-  -moz-user-select: none;
-  text-decoration: none;
-  color: black;
-}
-
-vbox {
-  width: inherit;
-  height: inherit;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-#missingPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
-}
-
-#disabledPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginDisabled.png);
-}
-
-#blockedPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked.png);
-}
-
-#missingPluginPlaceholder,
-#disabledPluginPlaceholder,
-#blockedPluginPlaceholder {
-  display: block;
-  border: 0px;
-  width: 32px;
-  height: 32px;
-}
diff --git a/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed-aero.png b/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed-aero.png
new file mode 100644
index 000000000000..89d3e91a995f
Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed-aero.png differ
diff --git a/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed.png b/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed.png
new file mode 100644
index 000000000000..89d3e91a995f
Binary files /dev/null and b/toolkit/themes/winstripe/mozapps/plugins/pluginCrashed.png differ
diff --git a/toolkit/themes/winstripe/mozapps/plugins/pluginProblem.css b/toolkit/themes/winstripe/mozapps/plugins/pluginProblem.css
new file mode 100644
index 000000000000..99b885fba4c7
--- /dev/null
+++ b/toolkit/themes/winstripe/mozapps/plugins/pluginProblem.css
@@ -0,0 +1,79 @@
+@namespace html url(http://www.w3.org/1999/xhtml);
+
+/* These styles affect only the bound element, not other page content. */
+
+html|object:not([width]), html|object[width=""],
+html|embed:not([width]), html|embed[width=""],
+html|applet:not([width]), html|applet[width=""] {
+    width: 240px;
+}
+
+html|object:not([height]), html|object[height=""],
+html|embed:not([height]), html|embed[height=""],
+html|applet:not([height]), html|applet[height=""] {
+    height: 200px;
+}
+
+.mainBox {
+    width: inherit;
+    height: inherit;
+    overflow: hidden;
+    text-align: center;
+
+    background-image: url(chrome://mozapps/skin/plugins/backgroundStripes.png);
+    -moz-border-radius: 12px;
+    /* recessed effect with dark inner shadow and lightened bottom */
+    -moz-box-shadow: inset 0 1px 5px rgba(0,0,0,0.8),
+                           0 1px 0 rgba(255,255,255,0.2);
+    padding: 5px;
+    -moz-user-select: none;
+}
+:-moz-type-unsupported .mainBox,
+:-moz-handler-disabled .mainBox,
+:-moz-handler-blocked .mainBox {
+    -moz-user-focus: normal;
+}
+:-moz-type-unsupported .mainBox:focus,
+:-moz-handler-disabled .mainBox:focus,
+:-moz-handler-blocked .mainBox:focus {
+    outline: 1px dotted;
+}
+
+.icon {
+    min-width: 48px;
+    min-height: 48px;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+:-moz-type-unsupported .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
+}
+:-moz-handler-disabled .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginDisabled.png);
+}
+:-moz-handler-blocked .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginBlocked.png);
+}
+:-moz-handler-crashed .icon {
+    background-image: url(chrome://mozapps/skin/plugins/pluginCrashed.png);
+}
+
+.msg {
+    display: none;
+    color: white;
+    font: 12px sans-serif;
+    font-weight: bold;
+    cursor: default;
+    text-shadow: rgba(0,0,0,0.8) 0 0 5px;
+}
+:-moz-type-unsupported .msgUnsupported,
+:-moz-handler-disabled .msgDisabled,
+:-moz-handler-blocked .msgBlocked,
+:-moz-handler-crashed .msgCrashed,
+:-moz-handler-crashed .msgReload {
+    display: block;
+}
+
+html|A {
+    color: white;
+}
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 9a2562448004..61645a8b53bc 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -753,6 +753,7 @@ MAKEFILES_xulapp="
   toolkit/mozapps/extensions/Makefile
   toolkit/mozapps/handling/Makefile
   toolkit/mozapps/plugins/Makefile
+  toolkit/mozapps/readstrings/Makefile
   toolkit/mozapps/update/Makefile
   toolkit/mozapps/update/updater/Makefile
   toolkit/mozapps/xpinstall/Makefile
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 68782142ed1d..386930e00673 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -975,6 +975,19 @@ nsXULAppInfo::AppendObjCExceptionInfoToAppNotes(void* aException)
   return NS_ERROR_NOT_IMPLEMENTED;
 #endif
 }
+
+NS_IMETHODIMP
+nsXULAppInfo::GetSubmitReports(PRBool* aEnabled)
+{
+  return CrashReporter::GetSubmitReports(aEnabled);
+}
+
+NS_IMETHODIMP
+nsXULAppInfo::SetSubmitReports(PRBool aEnabled)
+{
+  return CrashReporter::SetSubmitReports(aEnabled);
+}
+
 #endif
 
 static const nsXULAppInfo kAppInfo;
diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSupportUnix.cpp
index 1afaa8f4315a..e21667e4381d 100644
--- a/toolkit/xre/nsNativeAppSupportUnix.cpp
+++ b/toolkit/xre/nsNativeAppSupportUnix.cpp
@@ -59,7 +59,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
 struct DBusMessage;  /* libosso.h references internals of dbus */
 
 #include <dbus/dbus.h>
@@ -157,7 +157,7 @@ public:
   NS_IMETHOD Stop(PRBool *aResult);
 
 private:
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
   osso_context_t *m_osso_context;    
   /* A note about why we need to have m_hw_state:
      the osso hardware callback does not tell us what changed, just
@@ -168,7 +168,7 @@ private:
 #endif
 };
 
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
 
 static void OssoDisplayCallback(osso_display_state_t state, gpointer data)
 {
@@ -309,7 +309,7 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
     exit(0);
   }
 
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
   /* zero state out. */
   memset(&m_hw_state, 0, sizeof(osso_hw_state_t));
 
@@ -454,7 +454,7 @@ nsNativeAppSupportUnix::Stop(PRBool *aResult)
   NS_ENSURE_ARG(aResult);
   *aResult = PR_TRUE;
 
-#ifdef NS_OSSO
+#ifdef MOZ_PLATFORM_MAEMO
   if (m_osso_context) {
     osso_hw_unset_event_cb(m_osso_context, nsnull);
     osso_rpc_unset_default_cb_f(m_osso_context, OssoDbusCallback, nsnull);
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 05667cb91754..f0afdce60f2f 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -135,7 +135,7 @@ LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
 endif
 
-ifdef MOZ_PLATFORM_HILDON
+ifdef MOZ_PLATFORM_MAEMO
 ifdef MOZ_ENABLE_GNOMEVFS
 LOCAL_INCLUDES   += $(MOZ_GNOMEVFS_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_GNOMEVFS_LIBS)
diff --git a/uriloader/exthandler/nsDBusHandlerApp.cpp b/uriloader/exthandler/nsDBusHandlerApp.cpp
index bac95802750d..a06d49288473 100644
--- a/uriloader/exthandler/nsDBusHandlerApp.cpp
+++ b/uriloader/exthandler/nsDBusHandlerApp.cpp
@@ -44,7 +44,7 @@
 #include "nsIClassInfoImpl.h"
 #include "nsCOMPtr.h"
 
-#ifdef NS_OSSO
+#if (MOZ_PLATFORM_MAEMO == 5)
 #include <libosso.h>
 
 #define APP_LAUNCH_BANNER_SERVICE           "com.nokia.hildon-desktop"
@@ -157,7 +157,7 @@ nsDBusHandlerApp::LaunchWithURI(nsIURI *aURI,
   if (dbus_connection_send(connection, msg, NULL)) {
     dbus_connection_flush(connection);
     dbus_message_unref(msg);
-#ifdef NS_OSSO
+#if (MOZ_PLATFORM_MAEMO == 5)
     msg = dbus_message_new_method_call (APP_LAUNCH_BANNER_SERVICE,
                                         APP_LAUNCH_BANNER_METHOD_PATH,
                                         APP_LAUNCH_BANNER_METHOD_INTERFACE,
diff --git a/uriloader/exthandler/unix/nsGNOMERegistry.cpp b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
index 509b153298ab..560b6347e2bf 100644
--- a/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -53,7 +53,7 @@
 #include <glib-object.h>
 #endif
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 #include <libintl.h>
 #endif
 
@@ -192,7 +192,7 @@ nsGNOMERegistry::GetFromType(const nsACString& aMIMEType)
   else 
     gnomeHandlerApp->GetName(name);
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
   // On Maemo/Hildon, GetName ends up calling gnome_vfs_mime_application_get_name,
   // which happens to return a non-localized message-id for the application. To
   // get the localized name for the application, we have to call dgettext with 
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
index ddbffba415fc..bfe53c367a06 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
 #include <glib.h>
 #include <hildon-uri.h>
 #include <hildon-mime.h>
@@ -57,7 +57,7 @@ nsresult
 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
 {
   nsresult rv = nsGNOMERegistry::LoadURL(aURI);
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
   if (NS_FAILED(rv)){
     HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
     if (action) {
@@ -90,7 +90,7 @@ nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
   if (*_retval)
     return NS_OK;
 
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
   HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
   if (action) {
     *_retval = PR_TRUE;
@@ -109,7 +109,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile)
   nsCAutoString nativePath;
   aFile->GetNativePath(nativePath);
 
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
   if(NS_SUCCEEDED(LaunchDefaultWithDBus(PromiseFlatCString(nativePath).get())))
     return NS_OK;
 #endif
@@ -150,7 +150,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile)
   return LaunchWithIProcess(mDefaultApplication, nativePath);
 }
 
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
 
 /* This method tries to launch the associated default handler for the given 
  * mime/file via hildon specific APIs (in this case hildon_mime_open_file* 
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.h b/uriloader/exthandler/unix/nsMIMEInfoUnix.h
index 64c7cace1b05..f05ae505cc54 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.h
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.h
@@ -57,7 +57,7 @@ protected:
   virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI);
 
   virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile *aFile);
-#if defined (MOZ_PLATFORM_HILDON) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
   nsresult LaunchDefaultWithDBus(const char *aFilePath);
   NS_IMETHOD GetPossibleApplicationHandlers(nsIMutableArray * *aPossibleAppHandlers);
 #endif
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
index 28cd5d23805c..f4fc700bc586 100644
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -1211,7 +1211,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolSch
 #ifdef MOZ_WIDGET_GTK2
   // Check the GConf registry for a protocol handler
   *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
   *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
 #endif
 #endif
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index 5996582a3b88..2f992561844e 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -118,7 +118,7 @@ EXTRA_DSO_LDOPTS += \
 		$(QCMS_LIBS) \
 		$(NULL)
 
-ifdef MOZ_PLATFORM_HILDON
+ifdef MOZ_PLATFORM_MAEMO
 ifdef MOZ_ENABLE_GCONF
 EXTRA_DSO_LDOPTS += $(MOZ_GCONF_LIBS)
 endif
@@ -145,7 +145,7 @@ include $(topsrcdir)/config/rules.mk
 CFLAGS          += $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
 CXXFLAGS        += $(MOZ_CAIRO_CFLAGS) $(MOZ_GTK2_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
 
-ifdef MOZ_PLATFORM_HILDON
+ifdef MOZ_PLATFORM_MAEMO
 ifdef MOZ_ENABLE_GCONF
 CXXFLAGS += $(MOZ_GCONF_CFLAGS)
 endif
diff --git a/widget/src/gtk2/mozcontainer.h b/widget/src/gtk2/mozcontainer.h
index d09bd2822323..7da70aaa52f4 100644
--- a/widget/src/gtk2/mozcontainer.h
+++ b/widget/src/gtk2/mozcontainer.h
@@ -84,7 +84,7 @@ extern "C" {
 #define MOZ_CONAINTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZ_CONTAINER_TYPE, MozContainerClass))
 
 #if (GTK_CHECK_VERSION(2, 12, 0) || \
-    (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_HILDON)))
+    (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_MAEMO)))
 #define HAVE_GTK_MOTION_HINTS
 #endif
 
diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
index b3c97315f763..73e27724415d 100644
--- a/widget/src/gtk2/nsFilePicker.cpp
+++ b/widget/src/gtk2/nsFilePicker.cpp
@@ -56,7 +56,7 @@
 #include "nsFilePicker.h"
 #include "nsAccessibilityHelper.h"
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
 #endif
 
@@ -433,7 +433,7 @@ nsFilePicker::Show(PRInt16 *aReturn)
   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
   const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
                                ? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
   GtkWidget *file_chooser =
     hildon_file_chooser_dialog_new_with_properties(parent_widget,
                                                    "action", action,
diff --git a/widget/src/gtk2/nsLookAndFeel.cpp b/widget/src/gtk2/nsLookAndFeel.cpp
index 1c92cc9b7142..ddd32deefb6d 100644
--- a/widget/src/gtk2/nsLookAndFeel.cpp
+++ b/widget/src/gtk2/nsLookAndFeel.cpp
@@ -43,7 +43,7 @@
 
 #include "gtkdrawing.h"
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 #include "nsIServiceManager.h"
 #include "nsIPropertyBag2.h"
 #include "nsLiteralString.h"
@@ -582,7 +582,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
         res = NS_ERROR_NOT_IMPLEMENTED;
         break;
     case eMetric_TouchEnabled:
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
         // All Hildon devices are touch-enabled
         aMetric = 1;
 #else
@@ -591,7 +591,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
 #endif
         break;
     case eMetric_MaemoClassic:
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
         {
             aMetric = 0;
             nsCOMPtr<nsIPropertyBag2> infoService(do_GetService("@mozilla.org/system-info;1"));
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 7c9509eefea0..25060b496959 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -38,7 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 #define MAEMO_CHANGES
 #endif
 
@@ -305,7 +305,7 @@ static GdkEventKey *gKeyEvent = NULL;
 static PRBool       gKeyEventCommitted = PR_FALSE;
 static PRBool       gKeyEventChanged = PR_FALSE;
 static PRBool       gIMESuppressCommit = PR_FALSE;
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 static PRBool       gIMEVirtualKeyboardOpened = PR_FALSE;
 #endif
 
@@ -3500,7 +3500,7 @@ nsWindow::OnVisibilityNotifyEvent(GtkWidget *aWidget,
 
         mIsFullyObscured = PR_FALSE;
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
 #ifdef USE_XIM
         // In Hildon/Maemo, a browser window will get into 'patially visible' state wheneven an
         // autocomplete feature is dropped down (from urlbar or from an entry form completion),
@@ -3510,7 +3510,7 @@ nsWindow::OnVisibilityNotifyEvent(GtkWidget *aWidget,
         // to this it until the pointer is ungrabbed.
         if(!gIMEVirtualKeyboardOpened)
 #endif // USE_XIM
-#endif // MOZ_PLATFORM_HILDON
+#endif // MOZ_PLATFORM_MAEMO
         // if we have to retry the grab, retry it.
         EnsureGrabs();
         break;
@@ -6853,7 +6853,7 @@ nsWindow::IMEGetContext()
 static PRBool
 IsIMEEnabledState(PRUint32 aState)
 {
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
     return aState == nsIWidget::IME_STATUS_ENABLED ||
            aState == nsIWidget::IME_STATUS_PLUGIN  ||
            aState == nsIWidget::IME_STATUS_PASSWORD;
@@ -7061,7 +7061,7 @@ nsWindow::SetIMEEnabled(PRUint32 aState)
         // Even when aState is not PR_TRUE, we need to set IME focus.
         // Because some IMs are updating the status bar of them in this time.
         focusedWin->IMESetFocus();
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
         if (mIMEData->mEnabled) {
             // It is not desired that the hildon's autocomplete mechanism displays
             // user previous entered passwds, so lets make completions invisible
@@ -7437,7 +7437,7 @@ IM_get_input_context(nsWindow *aWindow)
         data->mEnabled == nsIWidget::IME_STATUS_PLUGIN)
         return data->mContext;
     if (data->mEnabled == nsIWidget::IME_STATUS_PASSWORD)
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
         return data->mContext;
 #else
         return data->mSimpleContext;
diff --git a/xpcom/base/nsMemoryImpl.cpp b/xpcom/base/nsMemoryImpl.cpp
index 18df3396b3fe..785fdee9e1cf 100644
--- a/xpcom/base/nsMemoryImpl.cpp
+++ b/xpcom/base/nsMemoryImpl.cpp
@@ -57,7 +57,7 @@
 #include <windows.h>
 #endif
 
-#if defined (NS_OSSO)
+#if defined(MOZ_PLATFORM_MAEMO)
 #include <osso-mem.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -128,7 +128,7 @@ nsMemoryImpl::IsLowMemory(PRBool *result)
     GlobalMemoryStatusEx(&stat);
     *result = (stat.ullAvailPageFile < kRequiredMemory) &&
         ((float)stat.ullAvailPageFile / stat.ullTotalPageFile) < 0.1;
-#elif defined(NS_OSSO)
+#elif defined(MOZ_PLATFORM_MAEMO)
     static int osso_highmark_fd = -1;
     if (osso_highmark_fd == -1) {
         osso_highmark_fd = open (kHighMark, O_RDONLY);
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index 122767cf80e0..8c4afa6e8c05 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -100,7 +100,7 @@ nsSystemInfo::Init()
 #endif
 
 
-#ifdef MOZ_PLATFORM_HILDON
+#ifdef MOZ_PLATFORM_MAEMO
     char *  line = nsnull;
     size_t  len = 0;
     ssize_t read;
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index be26a290fb27..e4438ba0ed2a 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -170,8 +170,8 @@ endif
 
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-ifdef MOZ_PLATFORM_HILDON
-EXTRA_DSO_LDOPTS += $(LIBHILDONMIME_LIBS)
+ifdef MOZ_PLATFORM_MAEMO
+EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif
 endif
 
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index aca2b4b18d12..b27fe3af6bb7 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -154,6 +154,10 @@ XPIDLSRCS += nsIWindowsRegKey.idl
 EXPORTS += nsWindowsRegKey.h
 endif
 
+EXTRA_COMPONENTS = \
+  nsINIProcessor.js \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/xpcom/ds/nsIINIParser.idl b/xpcom/ds/nsIINIParser.idl
index fd3e38920a5c..884719a1cdea 100644
--- a/xpcom/ds/nsIINIParser.idl
+++ b/xpcom/ds/nsIINIParser.idl
@@ -59,6 +59,20 @@ interface nsIINIParser : nsISupports
   AUTF8String getString(in AUTF8String aSection, in AUTF8String aKey);
 };
 
+[scriptable, uuid(712dc5da-8d09-45d0-ba2e-de27eb384c4c)]
+interface nsIINIParserWriter : nsISupports
+{
+  /**
+   * Set the value of a string for a particular section and key.
+   */
+  void setString(in AUTF8String aSection, in AUTF8String aKey, in AUTF8String aValue);
+
+  /**
+   * Write to the INI file.
+   */
+  void writeFile([optional] in nsILocalFile aINIFile);
+};
+
 [scriptable, uuid(ccae7ea5-1218-4b51-aecb-c2d8ecd46af9)]
 interface nsIINIParserFactory : nsISupports
 {
diff --git a/xpcom/ds/nsINIProcessor.js b/xpcom/ds/nsINIProcessor.js
new file mode 100644
index 000000000000..9e38d381321f
--- /dev/null
+++ b/xpcom/ds/nsINIProcessor.js
@@ -0,0 +1,209 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Justin Dolske <dolske@mozilla.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+const Cu = Components.utils;
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function INIProcessorFactory() {
+}
+
+INIProcessorFactory.prototype = {
+    classDescription: "INIProcessorFactory",
+    contractID: "@mozilla.org/xpcom/ini-processor-factory;1",
+    classID: Components.ID("{6ec5f479-8e13-4403-b6ca-fe4c2dca14fd}"),
+    QueryInterface : XPCOMUtils.generateQI([Ci.nsIINIParserFactory]),
+
+    createINIParser : function (aINIFile) {
+        return new INIProcessor(aINIFile);
+    }
+
+}; // end of INIProcessorFactory implementation
+
+const MODE_WRONLY = 0x02;
+const MODE_CREATE = 0x08;
+const MODE_TRUNCATE = 0x20;
+
+// nsIINIParser implementation
+function INIProcessor(aFile) {
+    this._iniFile = aFile;
+    this._iniData = {};
+    this._readFile();
+}
+
+INIProcessor.prototype = {
+    QueryInterface : XPCOMUtils.generateQI([Ci.nsIINIParser, Ci.nsIINIParserWriter]),
+
+    __utfConverter : null, // UCS2 <--> UTF8 string conversion
+    get _utfConverter() {
+        if (!this.__utfConverter) {
+            this.__utfConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                                  createInstance(Ci.nsIScriptableUnicodeConverter);
+            this.__utfConverter.charset = "UTF-8";
+        }
+        return this.__utfConverter;
+    },
+
+    _utfConverterReset : function() {
+        this.__utfConverter = null;
+    },
+
+    _iniFile : null,
+    _iniData : null,
+
+    /*
+     * Reads the INI file and stores the data internally.
+     */
+    _readFile : function() {
+        // If file doesn't exist, there's nothing to do.
+        if (!this._iniFile.exists() || 0 == this._iniFile.fileSize)
+            return;
+
+        let iniParser = Cc["@mozilla.org/xpcom/ini-parser-factory;1"]
+            .getService(Ci.nsIINIParserFactory).createINIParser(this._iniFile);
+        for (let section in XPCOMUtils.IterStringEnumerator(iniParser.getSections())) {
+            this._iniData[section] = {};
+            for (let key in XPCOMUtils.IterStringEnumerator(iniParser.getKeys(section))) {
+                this._iniData[section][key] = iniParser.getString(section, key);
+            }
+        }
+    },
+
+    // nsIINIParser
+
+    getSections : function() {
+        let sections = [];
+        for (let section in this._iniData)
+            sections.push(section);
+        return new stringEnumerator(sections);
+    },
+
+    getKeys : function(aSection) {
+        let keys = [];
+        if (aSection in this._iniData)
+            for (let key in this._iniData[aSection])
+                keys.push(key);
+        return new stringEnumerator(keys);
+    },
+
+    getString : function(aSection, aKey) {
+        if (!(aSection in this._iniData))
+            throw Cr.NS_ERROR_FAILURE;
+        if (!(aKey in this._iniData[aSection]))
+            throw Cr.NS_ERROR_FAILURE;
+        return this._iniData[aSection][aKey];
+    },
+
+
+    // nsIINIParserWriter
+
+    setString : function(aSection, aKey, aValue) {
+        const isSectionIllegal = /[\0\r\n\[\]]/;
+        const isKeyValIllegal  = /[\0\r\n=]/;
+
+        if (isSectionIllegal.test(aSection))
+            throw Components.Exception("bad character in section name",
+                                       Cr.ERROR_ILLEGAL_VALUE);
+        if (isKeyValIllegal.test(aKey) || isKeyValIllegal.test(aValue))
+            throw Components.Exception("bad character in key/value",
+                                       Cr.ERROR_ILLEGAL_VALUE);
+
+        if (!(aSection in this._iniData))
+            this._iniData[aSection] = {};
+
+        this._iniData[aSection][aKey] = aValue;
+    },
+
+    writeFile : function(aFile) {
+
+        let converter = this._utfConverter;
+        function writeLine(data) {
+            data = converter.ConvertFromUnicode(data);
+            data += converter.Finish();
+            data += "\n";
+            outputStream.write(data, data.length);
+        }
+
+        if (!aFile)
+            aFile = this._iniFile;
+
+        let safeStream = Cc["@mozilla.org/network/safe-file-output-stream;1"].
+                         createInstance(Ci.nsIFileOutputStream);
+        safeStream.init(aFile, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE,
+                        0600, null);
+
+        var outputStream = Cc["@mozilla.org/network/buffered-output-stream;1"].
+                           createInstance(Ci.nsIBufferedOutputStream);
+        outputStream.init(safeStream, 8192);
+        outputStream.QueryInterface(Ci.nsISafeOutputStream); // for .finish()
+
+        for (let section in this._iniData) {
+            writeLine("[" + section + "]");
+            for (let key in this._iniData[section]) {
+                writeLine(key + "=" + this._iniData[section][key]);
+            }
+        }
+
+        outputStream.finish();
+    }
+};
+
+function stringEnumerator(stringArray) {
+    this._strings = stringArray;
+}
+stringEnumerator.prototype = {
+    QueryInterface : XPCOMUtils.generateQI([Ci.nsIUTF8StringEnumerator]),
+
+    _strings : null,
+    _enumIndex: 0,
+
+    hasMore : function() {
+        return (this._enumIndex < this._strings.length);
+    },
+
+    getNext : function() {
+        return this._strings[this._enumIndex++];
+    }
+};
+
+let component = [INIProcessorFactory];
+function NSGetModule (compMgr, fileSpec) {
+    return XPCOMUtils.generateModule(component);
+}
diff --git a/xpcom/glue/nsCRTGlue.cpp b/xpcom/glue/nsCRTGlue.cpp
index 5baf337188a0..134dee0b66a7 100644
--- a/xpcom/glue/nsCRTGlue.cpp
+++ b/xpcom/glue/nsCRTGlue.cpp
@@ -91,7 +91,7 @@ NS_strtok(const char *delims, char **str)
   } while (*i);
 
   *str = NULL;
-  return ret;
+  return NULL;
 }
 
 PRUint32
diff --git a/xpcom/glue/nsINIParser.cpp b/xpcom/glue/nsINIParser.cpp
index c6a37d937574..f86bcea196e7 100644
--- a/xpcom/glue/nsINIParser.cpp
+++ b/xpcom/glue/nsINIParser.cpp
@@ -163,7 +163,6 @@ nsINIParser::InitFromFILE(FILE *fd)
 
     char *buffer = mFileContents;
     char *currSection = nsnull;
-    INIValue *last = nsnull;
 
     // outer loop tokenizes into lines
     while (char *token = NS_strtok(kNL, &buffer)) {
@@ -177,7 +176,6 @@ nsINIParser::InitFromFILE(FILE *fd)
         if (token[0] == '[') { // section header!
             ++token;
             currSection = token;
-            last = nsnull;
 
             char *rb = NS_strtok(kRBracket, &token);
             if (!rb || NS_strtok(kWhitespace, &token)) {
@@ -202,28 +200,32 @@ nsINIParser::InitFromFILE(FILE *fd)
         if (!e)
             continue;
 
-        INIValue *val = new INIValue(key, token);
-        if (!val)
-            return NS_ERROR_OUT_OF_MEMORY;
+        INIValue *v;
+        if (!mSections.Get(currSection, &v)) {
+            v = new INIValue(key, token);
+            if (!v)
+                return NS_ERROR_OUT_OF_MEMORY;
 
-        // If we haven't already added something to this section, "last" will
-        // be null.
-        if (!last) {
-            mSections.Get(currSection, &last);
-            while (last && last->next)
-                last = last->next;
-        }
-
-        if (last) {
-            // Add this element on to the tail of the existing list
-
-            last->next = val;
-            last = val;
+            mSections.Put(currSection, v);
             continue;
         }
 
-        // We've never encountered this section before, add it to the head
-        mSections.Put(currSection, val);
+        // Check whether this key has already been specified; overwrite
+        // if so, or append if not.
+        while (v) {
+            if (!strcmp(key, v->key)) {
+                v->value = token;
+                break;
+            }
+            if (!v->next) {
+                v->next = new INIValue(key, token);
+                if (!v->next)
+                    return NS_ERROR_OUT_OF_MEMORY;
+                break;
+            }
+            v = v->next;
+        }
+        NS_ASSERTION(v, "v should never be null coming out of this loop");
     }
 
     return NS_OK;
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index bf35c09a4977..f6f05e6fcdc5 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -199,8 +199,8 @@ endif
 
 LOCAL_INCLUDES	= -I..
 
-ifdef MOZ_PLATFORM_HILDON
-CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS)
-CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS)
+ifeq ($(MOZ_PLATFORM_MAEMO), 5)
+CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
+CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 endif
 
diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index 59ed01d3e1a0..0c29bcfca695 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -490,7 +490,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirectory,
 
         rv = file->AppendNative(NS_LITERAL_CSTRING("Desktop"));
     }
-#if defined(NS_OSSO)
+#if defined(MOZ_PLATFORM_MAEMO)
     // "MYDOCSDIR" is exported to point to "/home/user/MyDocs" in maemo.
     else if (Unix_XDG_Documents == aSystemDirectory) {
 
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index ea8a048c4854..9cc30b1c4c24 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -92,7 +92,7 @@
 #include "nsIGnomeVFSService.h"
 #endif
 
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO == 5)
 #include <glib.h>
 #include <hildon-uri.h>
 #include <hildon-mime.h>
@@ -1746,7 +1746,7 @@ NS_IMETHODIMP
 nsLocalFile::Launch()
 {
 #ifdef MOZ_WIDGET_GTK2
-#ifdef MOZ_PLATFORM_HILDON
+#if (MOZ_PLATFORM_MAEMO==5)
     const PRInt32 kHILDON_SUCCESS = 1;
     DBusError err;
     dbus_error_init(&err);
diff --git a/xpcom/system/nsICrashReporter.idl b/xpcom/system/nsICrashReporter.idl
index 683966c2dd38..171e16e70cf4 100644
--- a/xpcom/system/nsICrashReporter.idl
+++ b/xpcom/system/nsICrashReporter.idl
@@ -47,7 +47,7 @@ interface nsIURL;
  *                    future releases.
  */
 
-[scriptable, uuid(44650737-59f7-4c9b-adbe-2b6d4dfee86a)]
+[scriptable, uuid(56761088-57ad-4f5c-bd61-f678c2807fe0)]
 interface nsICrashReporter : nsISupports
 {
   /**
@@ -117,4 +117,9 @@ interface nsICrashReporter : nsISupports
    * @param aException  NSException object to append note for
    */
   [noscript] void appendObjCExceptionInfoToAppNotes(in voidPtr aException);
+
+  /**
+   * User preference for submitting crash reports.
+   */
+  attribute boolean submitReports;
 };
diff --git a/xpcom/tests/unit/data/iniparser01.ini b/xpcom/tests/unit/data/iniparser01.ini
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/xpcom/tests/unit/data/iniparser02.ini b/xpcom/tests/unit/data/iniparser02.ini
new file mode 100644
index 000000000000..d3f5a12faa99
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser02.ini
@@ -0,0 +1 @@
+
diff --git a/xpcom/tests/unit/data/iniparser03.ini b/xpcom/tests/unit/data/iniparser03.ini
new file mode 100644
index 000000000000..60b0742537a3
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser03.ini
@@ -0,0 +1 @@
+[]
diff --git a/xpcom/tests/unit/data/iniparser04.ini b/xpcom/tests/unit/data/iniparser04.ini
new file mode 100644
index 000000000000..23a50d155f56
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser04.ini
@@ -0,0 +1 @@
+[section1]
diff --git a/xpcom/tests/unit/data/iniparser05.ini b/xpcom/tests/unit/data/iniparser05.ini
new file mode 100644
index 000000000000..ade13733774b
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser05.ini
@@ -0,0 +1 @@
+[section1]junk
diff --git a/xpcom/tests/unit/data/iniparser06.ini b/xpcom/tests/unit/data/iniparser06.ini
new file mode 100644
index 000000000000..c24821e6ed52
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser06.ini
@@ -0,0 +1,2 @@
+[section1]
+
diff --git a/xpcom/tests/unit/data/iniparser07.ini b/xpcom/tests/unit/data/iniparser07.ini
new file mode 100644
index 000000000000..49816873b2e7
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser07.ini
@@ -0,0 +1,2 @@
+[section1]
+name1
diff --git a/xpcom/tests/unit/data/iniparser08.ini b/xpcom/tests/unit/data/iniparser08.ini
new file mode 100644
index 000000000000..cfa15c9ffec3
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser08.ini
@@ -0,0 +1,2 @@
+[section1]
+name1=
diff --git a/xpcom/tests/unit/data/iniparser09.ini b/xpcom/tests/unit/data/iniparser09.ini
new file mode 100644
index 000000000000..1c87762ba436
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser09.ini
@@ -0,0 +1,2 @@
+[section1]
+name1=value1
diff --git a/xpcom/tests/unit/data/iniparser10.ini b/xpcom/tests/unit/data/iniparser10.ini
new file mode 100644
index 000000000000..037fd793039f
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser10.ini
@@ -0,0 +1,3 @@
+
+[section1]
+name1=value1
diff --git a/xpcom/tests/unit/data/iniparser11.ini b/xpcom/tests/unit/data/iniparser11.ini
new file mode 100644
index 000000000000..f8d573a284f2
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser11.ini
@@ -0,0 +1,3 @@
+# comment
+[section1]
+name1=value1
diff --git a/xpcom/tests/unit/data/iniparser12.ini b/xpcom/tests/unit/data/iniparser12.ini
new file mode 100644
index 000000000000..2727940c097a
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser12.ini
@@ -0,0 +1,3 @@
+[section1]
+# [sectionBAD]
+name1=value1
diff --git a/xpcom/tests/unit/data/iniparser13.ini b/xpcom/tests/unit/data/iniparser13.ini
new file mode 100644
index 000000000000..21d40b140cde
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser13.ini
@@ -0,0 +1,3 @@
+[section1]
+name1=value1
+# nameBAD=valueBAD
diff --git a/xpcom/tests/unit/data/iniparser14.ini b/xpcom/tests/unit/data/iniparser14.ini
new file mode 100644
index 000000000000..744af4cb65ea
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser14.ini
@@ -0,0 +1,6 @@
+[section1]
+name1=value1
+name2=value2
+[section2]
+name1=value1
+name2=foopy
diff --git a/xpcom/tests/unit/data/iniparser15.ini b/xpcom/tests/unit/data/iniparser15.ini
new file mode 100644
index 000000000000..608a27d8fb36
--- /dev/null
+++ b/xpcom/tests/unit/data/iniparser15.ini
@@ -0,0 +1,6 @@
+[section1]
+name1=value1
+[section2]
+name1=foopy
+[section1]
+name1=newValue1
diff --git a/xpcom/tests/unit/test_iniProcessor.js b/xpcom/tests/unit/test_iniProcessor.js
new file mode 100644
index 000000000000..41dea378a171
--- /dev/null
+++ b/xpcom/tests/unit/test_iniProcessor.js
@@ -0,0 +1,211 @@
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cr = Components.results;
+
+let testnum = 0;
+let factory;
+
+function parserForFile(filename) {
+    let parser = null;
+    try {
+        let file = do_get_file(filename);
+        do_check_true(!!file);
+        parser = factory.createINIParser(file);
+        do_check_true(!!parser);
+    } catch(e) {
+	dump("INFO | caught error: " + e);
+        // checkParserOutput will handle a null parser when it's expected.
+    }
+    return parser;
+    
+}
+
+function checkParserOutput(parser, expected) {
+    // If the expected output is null, we expect the parser to have
+    // failed (and vice-versa).
+    if (!parser || !expected) {
+        do_check_eq(parser, null);
+        do_check_eq(expected, null);
+        return;
+    }
+
+    let output = getParserOutput(parser);
+    for (let section in expected) {
+        do_check_true(section in output);
+        for (let key in expected[section]) {
+            do_check_true(key in output[section]);
+            do_check_eq(output[section][key], expected[section][key]);
+            delete output[section][key];
+        }
+        for (let key in output[section])
+            do_check_eq(key, "wasn't expecting this key!");
+        delete output[section];
+    }
+    for (let section in output)
+        do_check_eq(section, "wasn't expecting this section!");
+}
+
+function getParserOutput(parser) {
+    let output = {};
+
+    let sections = parser.getSections();
+    do_check_true(!!sections);
+    while (sections.hasMore()) {
+        let section = sections.getNext();
+        do_check_false(section in output); // catch dupes
+        output[section] = {};
+
+        let keys = parser.getKeys(section);
+        do_check_true(!!keys);
+        while (keys.hasMore()) {
+            let key = keys.getNext();
+            do_check_false(key in output[section]); // catch dupes
+            let value = parser.getString(section, key);
+            output[section][key] = value;
+        }
+    }
+    return output;
+}
+
+function run_test() {
+try {
+
+let testdata = [
+    { filename: "data/iniparser01.ini", reference: {} },
+    { filename: "data/iniparser02.ini", reference: {} },
+    { filename: "data/iniparser03.ini", reference: {} },
+    { filename: "data/iniparser04.ini", reference: {} },
+    { filename: "data/iniparser05.ini", reference: {} },
+    { filename: "data/iniparser06.ini", reference: {} },
+    { filename: "data/iniparser07.ini", reference: {} },
+    { filename: "data/iniparser08.ini", reference: { section1: { name1: "" }} },
+    { filename: "data/iniparser09.ini", reference: { section1: { name1: "value1" } } },
+    { filename: "data/iniparser10.ini", reference: { section1: { name1: "value1" } } },
+    { filename: "data/iniparser11.ini", reference: { section1: { name1: "value1" } } },
+    { filename: "data/iniparser12.ini", reference: { section1: { name1: "value1" } } },
+    { filename: "data/iniparser13.ini", reference: { section1: { name1: "value1" } } },
+    { filename: "data/iniparser14.ini", reference: 
+                    { section1: { name1: "value1", name2: "value2" },
+                      section2: { name1: "value1", name2: "foopy"  }} },
+    { filename: "data/iniparser15.ini", reference: 
+                    { section1: { name1: "newValue1" },
+                      section2: { name1: "foopy"     }} },
+    ];
+
+/* ========== 0 ========== */
+factory = Cc["@mozilla.org/xpcom/ini-processor-factory;1"].
+          getService(Ci.nsIINIParserFactory);
+do_check_true(!!factory);
+
+/* ========== 1 - 15 ========== */
+
+// Test reading from a variety of files. While we're at it, write out each one
+// and read it back to ensure that nothing changed.
+for (testnum = 1; testnum <= 15; testnum++) {
+    let filename = testdata[testnum -1].filename;
+    dump("INFO | test #" + testnum + ", filename " + filename + "\n");
+    let parser = parserForFile(filename);
+    checkParserOutput(parser, testdata[testnum - 1].reference);
+    if (!parser)
+        continue;
+    do_check_true(parser instanceof Ci.nsIINIParserWriter);
+    // write contents out to a new file
+    let newfilename = filename + ".new";
+    let newfile = do_get_file(filename);
+    newfile.leafName += ".new";
+    parser.writeFile(newfile);
+    // read new file and make sure the contents are the same.
+    parser = parserForFile(newfilename);
+    checkParserOutput(parser, testdata[testnum - 1].reference);
+}
+
+/* ========== 16 ========== */
+
+// test writing to a new file.
+let newfile = do_get_file("data/");
+newfile.append("non-existant-file.ini");
+if (newfile.exists())
+    newfile.remove(false);
+do_check_false(newfile.exists());
+
+let parser = factory.createINIParser(newfile);
+do_check_true(!!parser);
+do_check_true(parser instanceof Ci.nsIINIParserWriter);
+checkParserOutput(parser, {});
+parser.writeFile();
+do_check_true(newfile.exists());
+
+// test adding a new section and new key
+parser.setString("section", "key", "value");
+parser.writeFile();
+do_check_true(newfile.exists());
+checkParserOutput(parser, {section: {key: "value"} });
+// read it in again, check for same data.
+parser = parserForFile("data/non-existant-file.ini");
+checkParserOutput(parser, {section: {key: "value"} });
+
+/* ========== 17 ========== */
+
+// test modifying a existing key's value (in an existing section)
+parser = parserForFile("data/iniparser09.ini");
+checkParserOutput(parser, {section1: {name1: "value1"} });
+
+do_check_true(parser instanceof Ci.nsIINIParserWriter);
+parser.setString("section1", "name1", "value2");
+checkParserOutput(parser, {section1: {name1: "value2"} });
+
+/* ========== 18 ========== */
+
+// test trying to set illegal characters
+let caughtError;
+caughtError = false;
+checkParserOutput(parser, {section1: {name1: "value2"} });
+
+// Bad characters in section name
+try { parser.SetString("bad\0", "ok", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("bad\r", "ok", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("bad\n", "ok", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("bad[", "ok", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("bad]", "ok", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+
+// Bad characters in key name
+caughtError = false;
+try { parser.SetString("ok", "bad\0", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "bad\r", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "bad\n", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "bad=", "ok"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+
+// Bad characters in value
+caughtError = false;
+try { parser.SetString("ok", "ok", "bad\0"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "ok", "bad\r"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "ok", "bad\n"); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+caughtError = false;
+try { parser.SetString("ok", "ok", "bad="); } catch (e) { caughtError = true; }
+do_check_true(caughtError);
+
+} catch(e) {
+    throw "FAILED in test #" + testnum + " -- " + e;
+}
+}