bustage fix #2

browser/components/migration/src/nsIEProfileMigrator.cpp

@@ -1031,9 +1031,10 @@ nsIEProfileMigrator::EnumerateUsernames(const nsAString& aKey, PRUnichar* aData,
         nsresult rv;
 
         nsCOMPtr<nsILoginInfo> aLogin (do_CreateInstance(NS_LOGININFO_CONTRACTID, &rv));
-        NS_ENSURE_SUCCESS(rv, rv);
+        NS_ENSURE_SUCCESS(rv, /* */);
 
-        aLogin->Init(realm, EmptyString(), nsnull, usernameStr, passStr, aKey, EmptyString());
+        // XXX Init() needs to treat EmptyString()s the same as void strings, disable for now
+        //aLogin->Init(realm, EmptyString(), nsnull, usernameStr, passStr, aKey, EmptyString());
 
         pwmgr->AddLogin(aLogin);
       }