Bug #214400 --> allow distributors to allow 4.x profile migration via a pref instead of forcing it to be off for thunderbird and firebird.

This removes a MOZ_XUL_APP ifdef

sr=bienvenu

browser/app/profile/all.js

@@ -524,7 +524,8 @@ pref("mousewheel.withaltkey.action",0);
 pref("mousewheel.withaltkey.numlines",1);
 pref("mousewheel.withaltkey.sysnumlines",false);
 
-pref("profile.confirm_automigration",true);
+pref("profile.confirm_automigration",true);
+pref("profile.allow_automigration", false);   // setting to false bypasses automigration in the profile code
 
 // the amount of time (in seconds) that must elapse
 // before we think your mozilla profile is defunct

browser/app/profile/firebird.js

@@ -524,7 +524,8 @@ pref("mousewheel.withaltkey.action",0);
 pref("mousewheel.withaltkey.numlines",1);
 pref("mousewheel.withaltkey.sysnumlines",false);
 
-pref("profile.confirm_automigration",true);
+pref("profile.confirm_automigration",true);
+pref("profile.allow_automigration", false);   // setting to false bypasses automigration in the profile code
 
 // the amount of time (in seconds) that must elapse
 // before we think your mozilla profile is defunct

profile/src/nsProfile.cpp

@@ -119,7 +119,7 @@
 #define CONTENTLOCALE_CMD_LINE_ARG "-contentLocale"   
 
 #define PREF_CONFIRM_AUTOMIGRATION     "profile.confirm_automigration"
-#define SHRIMP_PREF                    "shrimp.startup.enable"
+#define PREF_AUTOMIGRATION             "profile.allow_automigration"
 
 #if defined (XP_MAC)
 #define CHROME_STYLE nsIWebBrowserChrome::CHROME_WINDOW_BORDERS | nsIWebBrowserChrome::CHROME_WINDOW_CLOSE | nsIWebBrowserChrome::CHROME_CENTER_SCREEN
@@ -887,11 +887,20 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
 		NS_ASSERTION(NS_SUCCEEDED(rv),"failed to determine if we should force migration");
 	}
 
-#ifndef MOZ_XUL_APP // The phoenix/thunderbird doesn't use old profiles.
+    nsCOMPtr<nsIPrefBranch> prefBranch;
+   
+    // First check PREF_AUTOMIGRATION. 
+    PRBool allowAutoMigration = PR_TRUE;
+    nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+    if (NS_FAILED(rv)) return rv;
+    rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
+    if (NS_FAILED(rv)) return rv;
+
+    (void)prefBranch->GetBoolPref(PREF_AUTOMIGRATION, &allowAutoMigration);
 
     // Start Migaration activity
     rv = cmdLineArgs->GetCmdLineValue(INSTALLER_CMD_LINE_ARG, getter_Copies(cmdResult));
-    if (NS_SUCCEEDED(rv) || forceMigration)
+    if (allowAutoMigration && (NS_SUCCEEDED(rv) || forceMigration))
     {        
         if (cmdResult || forceMigration) {
             rv = MigrateProfileInfo();
@@ -929,8 +938,6 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
         }
     }
 
-#endif // MOZ_XUL_APP
-
 #ifdef DEBUG_profile_verbose
     printf("Profile Manager : Command Line Options : End\n");
 #endif