Re-enable the actual distribution/bundles loading code from bug 392251, now that the Ts regression is fixed.

toolkit/xre/nsXREDirProvider.cpp

@@ -547,9 +547,7 @@ nsXREDirProvider::LoadBundleDirectories()
   if (mXULAppDir) {
     LoadPlatformDirectory(mXULAppDir, mAppBundleDirectories);
 
-#ifdef LOAD_DISTRO_BUNDLES
     LoadAppBundleDirs();
-#endif
   }
 
   if (mProfileDir && !gSafeMode) {
@@ -575,7 +573,6 @@ nsXREDirProvider::LoadBundleDirectories()
   }
 }
 
-#ifdef LOAD_DISTRO_BUNDLES
 void
 nsXREDirProvider::LoadAppBundleDirs()
 {
@@ -609,7 +606,6 @@ nsXREDirProvider::LoadAppBundleDirs()
     LoadPlatformDirectory(subdir, mAppBundleDirectories);
   }
 }
-#endif // LOAD_DISTRO_BUNDLES
 
 static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull };
 

toolkit/xre/nsXREDirProvider.h

@@ -122,10 +122,7 @@ protected:
   // Calculate all bundle directories, including distribution bundles,
   // extensions, and themes
   void LoadBundleDirectories();
-
-#ifdef LOAD_DISTRO_BUNDLES
   void LoadAppBundleDirs();
-#endif
 
   void Append(nsIFile* aDirectory);