Missed file from the checkin of Bug 368587 - avoid the second UAC prompt for helper.exe on software update by launching it directly from the elevated updater.exe process. r=bsmedberg, a=mconnor

browser/installer/windows/nsis/uninstaller.nsi

@@ -62,9 +62,13 @@ Var TmpVal
 !include WordFunc.nsh
 !include MUI.nsh
 
+!insertmacro FileJoin
 !insertmacro GetOptions
 !insertmacro GetParameters
+!insertmacro LineFind
 !insertmacro StrFilter
+!insertmacro TextCompare
+!insertmacro TrimNewLines
 !insertmacro WordFind
 !insertmacro WordReplace
 
@@ -86,8 +90,10 @@ VIAddVersionKey "FileDescription" "${BrandShortName} Helper"
 !insertmacro CleanVirtualStore
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
+!insertmacro UpdateUninstallLog
 !insertmacro WriteRegStr2
 !insertmacro WriteRegDWORD2
+
 !insertmacro un.RegCleanMain
 !insertmacro un.RegCleanUninstall
 !insertmacro un.CleanVirtualStore
@@ -231,7 +237,7 @@ Section "Uninstall"
   ${If} ${FileExists} "$INSTDIR\uninstall\uninstall.log"
     ; Copy the uninstall log file to a temporary file
     GetTempFileName $TmpVal
-    CopyFiles "$INSTDIR\uninstall\uninstall.log" "$TmpVal"
+    CopyFiles /SILENT /FILESONLY "$INSTDIR\uninstall\uninstall.log" "$TmpVal"
 
     ; Unregister DLL's
     ${un.LineFind} "$TmpVal" "/NUL" "1:-1" "un.UnRegDLLsCallback"
@@ -478,7 +484,7 @@ Function .onInit
               ${If} ${FileExists} "$R3"
                 Delete "$INSTDIR\uninstall\*wizard*"
                 Delete "$INSTDIR\uninstall\uninstall.log"
-                CopyFiles /SILENT "$R3" "$INSTDIR\uninstall\"
+                CopyFiles /SILENT /FILESONLY "$R3" "$INSTDIR\uninstall\"
                 Push $R3
                 ${GetParentDir}
                 Pop $R4
@@ -486,6 +492,8 @@ Function .onInit
                 RmDir "$R4"
               ${EndIf}
             ${EndUnless}
+          ${Else}
+            ${UpdateUninstallLog}
           ${EndUnless}
           StrCpy $R1 "true"
         ${EndUnless}