Bug 486679 - misleading embedding assertion about NS_APP_USER_PROFILE_50_DIR not being defined, r=bsmedberg
authorTomeu Vizoso <tomeu@sugarlabs.org>
Mon, 13 Apr 2009 13:34:01 -0400
changeset 27273 260ad7c88d90d8094e58b4d546d1a9f0bc570e88
parent 27272 aca217ae28323cafa126b1034e2821fa2b6cbd81
child 27277 a7d8d7dee25001b3560fae142e31185db3a1af7b
push id6467
push userbsmedberg@mozilla.com
push dateMon, 13 Apr 2009 17:40:11 +0000
treeherdermozilla-central@260ad7c88d90 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs486679
milestone1.9.2a1pre
Bug 486679 - misleading embedding assertion about NS_APP_USER_PROFILE_50_DIR not being defined, r=bsmedberg
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -125,17 +125,18 @@ nsXREDirProvider::Initialize(nsIFile *aX
   mXULAppDir = aXULAppDir;
   mGREDir = aGREDir;
 
   if (!mProfileDir) {
     nsCOMPtr<nsIDirectoryServiceProvider> app(do_QueryInterface(mAppProvider));
     if (app) {
       PRBool per = PR_FALSE;
       app->GetFile(NS_APP_USER_PROFILE_50_DIR, &per, getter_AddRefs(mProfileDir));
-      NS_ASSERTION(per, "NS_APP_USER_PROFILE_50_DIR no defined! This shouldn't happen!"); 
+      NS_ASSERTION(per, "NS_APP_USER_PROFILE_50_DIR must be persistent!"); 
+      NS_ASSERTION(mProfileDir, "NS_APP_USER_PROFILE_50_DIR not defined! This shouldn't happen!"); 
     }
   }
 
   return NS_OK;
 }
 
 nsresult
 nsXREDirProvider::SetProfile(nsIFile* aDir, nsIFile* aLocalDir)