Bug 1090967 part 2 - Don't use "default" as the name of the default profile on Aurora. r=bsmedberg
authorPanos Astithas <past@mozilla.com>
Mon, 03 Nov 2014 16:38:54 +0200
changeset 233715 333f986e84ee60d9f9fbb10c93b18dc57f769a45
parent 233714 24bf9ff8e2bdbca8dd63d446d2dc183265d9ce44
child 233716 bf155bbfcdd7d43e79eb38fee485f2d167dff204
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1090967
milestone35.0a2
Bug 1090967 part 2 - Don't use "default" as the name of the default profile on Aurora. r=bsmedberg
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2412,25 +2412,35 @@ SelectProfile(nsIProfileLock* *aResult, 
 
   if (!count) {
     gDoMigration = true;
     gDoProfileReset = false;
 
     // create a default profile
     nsCOMPtr<nsIToolkitProfile> profile;
     nsresult rv = aProfileSvc->CreateProfile(nullptr, // choose a default dir for us
+#ifdef MOZ_DEV_EDITION
+                                             NS_LITERAL_CSTRING("dev-edition-default"),
+#else
                                              NS_LITERAL_CSTRING("default"),
+#endif
                                              getter_AddRefs(profile));
     if (NS_SUCCEEDED(rv)) {
+#ifndef MOZ_DEV_EDITION
       aProfileSvc->SetDefaultProfile(profile);
+#endif
       aProfileSvc->Flush();
       rv = profile->Lock(nullptr, aResult);
       if (NS_SUCCEEDED(rv)) {
         if (aProfileName)
+#ifdef MOZ_DEV_EDITION
+          aProfileName->AssignLiteral("dev-edition-default");
+#else
           aProfileName->AssignLiteral("default");
+#endif
         return NS_OK;
       }
     }
   }
 
   bool useDefault = true;
   if (count > 1 && CanShowProfileManager()) {
     aProfileSvc->GetStartWithLastProfile(&useDefault);