Bug 721242 - Delay Firefox migrator doStartup() call until after passwords are migrated. r=mak

browser/components/migration/src/FirefoxProfileMigrator.js

@@ -224,7 +224,6 @@ FirefoxProfileMigrator.prototype = {
   migrate : function Firefox_migrate(aItems, aStartup, aProfile)
   {
     if (aStartup) {
-      aStartup.doStartup();
       this._replaceBookmarks = true;
     }
 
@@ -246,6 +245,11 @@ FirefoxProfileMigrator.prototype = {
     if (aItems & MIGRATOR.PASSWORDS)
       this._migratePasswords();
 
+    // The password manager encryption key must be copied before startup.
+    if (aStartup) {
+      aStartup.doStartup();
+    }
+
     if (aItems & MIGRATOR.FORMDATA)
       this._migrateFormData();