Bugstage fix due to fallout from Bug 717070 landing. r=bustage-fix.
authorMike Conley <mconley@mozilla.com>
Fri, 09 Mar 2012 13:36:41 -0500
changeset 11043 d32f2001cc1f6350da8941f09e8c4f24882a6aa6
parent 11042 1648132268975b0156ee2241464da24ef96f5878
child 11044 1fcc5f6914e98f3b8b30dae5901663794bcbd51e
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs717070
Bugstage fix due to fallout from Bug 717070 landing. r=bustage-fix.
mail/components/migration/src/nsProfileMigrator.cpp
--- a/mail/components/migration/src/nsProfileMigrator.cpp
+++ b/mail/components/migration/src/nsProfileMigrator.cpp
@@ -60,17 +60,17 @@
 #endif
 
 NS_IMPL_ISUPPORTS1(nsProfileMigrator, nsIProfileMigrator)
 
 #define MIGRATION_WIZARD_FE_URL "chrome://messenger/content/migration/migration.xul"
 #define MIGRATION_WIZARD_FE_FEATURES "chrome,dialog,modal,centerscreen"
 
 NS_IMETHODIMP
-nsProfileMigrator::Migrate(nsIProfileStartup* aStartup)
+nsProfileMigrator::Migrate(nsIProfileStartup* aStartup, const nsACString& aKey)
 {
   nsCAutoString key;
   nsCOMPtr<nsIMailProfileMigrator> mailMigrator;
   nsresult rv = GetDefaultMailMigratorKey(key, mailMigrator);
   NS_ENSURE_SUCCESS(rv, rv); // abort migration if we failed to get a mailMigrator (if we were supposed to)
 
   nsCOMPtr<nsISupportsCString> cstr (do_CreateInstance("@mozilla.org/supports-cstring;1"));
   NS_ENSURE_TRUE(cstr, NS_ERROR_OUT_OF_MEMORY);