fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Allow running the postupdate process and change the update directory
for when not running in portable mode.

toolkit/mozapps/update/updater/updater.cpp

@@ -2807,7 +2807,7 @@ int LaunchCallbackAndPostProcessApps(int argc, NS_tchar** argv,
 #endif
 
   if (argc > callbackIndex) {
-#if defined(XP_WIN) && !defined(BASE_BROWSER_UPDATE)
+#if defined(XP_WIN)
     if (gSucceeded) {
       if (!LaunchWinPostProcess(gInstallDirPath, gPatchDirPath)) {
         fprintf(stderr, "The post update process was not launched");

toolkit/xre/nsXREDirProvider.cpp

@@ -1109,7 +1109,14 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
   rv = GetUserDataDirectory(getter_AddRefs(updRoot), false);
   NS_ENSURE_SUCCESS(rv, rv);
 #  else
+  bool isPortable = true;
+  rv = GetIsPortableMode(&isPortable);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (isPortable) {
     rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false);
+  } else {
+    rv = GetUserDataDirectory(getter_AddRefs(updRoot), true);
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 #  endif
   rv = updRoot->AppendNative("UpdateInfo"_ns);