Backed out 3 changesets (bug 1515451) for causing sm failures in comp…

…onents/updateagent/Cargo.toml

CLOSED TREE

Backed out changeset 85ea1d36da66 (bug 1515451)
Backed out changeset 779bc1fa07ae (bug 1515451)
Backed out changeset 0c6771b60b76 (bug 1515451)

Cargo.toml

@@ -14,7 +14,6 @@ members = [
   "security/manager/ssl/osclientcerts",
   "testing/geckodriver",
   "toolkit/crashreporter/rust",
-  "toolkit/components/updateagent",
   "toolkit/library/gtest/rust",
   "toolkit/library/rust/",
 ]

browser/config/mozconfigs/win32/mingwclang

@@ -43,7 +43,6 @@ ac_add_options --enable-proxy-bypass-protection
 # These aren't supported on mingw at this time
 ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-geckodriver # Bug 1489320
-ac_add_options --disable-update-agent # Bug 1561797
 
 # Find our toolchain
 HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang"

browser/config/mozconfigs/win64/mingwclang

@@ -43,7 +43,6 @@ ac_add_options --enable-proxy-bypass-protection
 # These aren't supported on mingw at this time
 ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-geckodriver # Bug 1489320
-ac_add_options --disable-update-agent # Bug 1561797
 
 # Find our toolchain
 HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang"

browser/installer/package-manifest.in

@@ -403,11 +403,6 @@ bin/libfreebl_64int_3.so
 @BINPATH@/maintenanceservice_installer.exe
 #endif
 
-; [Background Update Agent]
-#ifdef MOZ_UPDATE_AGENT
-@BINPATH@/updateagent@BIN_SUFFIX@
-#endif
-
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER

browser/installer/windows/nsis/defines.nsi.in

@@ -118,11 +118,6 @@
 !define MOZ_MAINTENANCE_SERVICE
 #endif
 
-#ifdef MOZ_UPDATE_AGENT
-!define MOZ_UPDATE_AGENT
-!define UpdateAgentFullName "Mozilla Update Agent"
-#endif
-
 #ifdef MOZ_BITS_DOWNLOAD
 !define MOZ_BITS_DOWNLOAD
 #endif

browser/installer/windows/nsis/installer.nsi

@@ -487,17 +487,6 @@ Section "-Application" APP_IDX
   ${EndIf}
 !endif
 
-!ifdef MOZ_UPDATE_AGENT
-  ${PushRegisterUpdateAgentTaskCommand} "register"
-  Pop $0
-  ${If} "$0" != ""
-    ${LogMsg} "Registering update agent task: $0"
-    nsExec::Exec $0
-    Pop $0
-    ${LogMsg} "nsExec::Exec returned $0"
-  ${EndIf}
-!endif
-
   ; These need special handling on uninstall since they may be overwritten by
   ; an install into a different location.
   StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}"

browser/installer/windows/nsis/shared.nsh

@@ -159,25 +159,6 @@
   ${EndIf}
 !endif
 
-!ifdef MOZ_UPDATE_AGENT
-  ; This macro runs the update agent with the update-task-local-service
-  ; command, if it detects the needed admin privileges. Otherwise it
-  ; runs with update-task.
-  ; Both commands attempt to remove the scheduled task, then register
-  ; a new one. If the task was registered by an elevated user, it won't
-  ; be removable when not elevated, so the unelevated attempt will fail
-  ; harmlessly.
-  ; Therefore it is safe to run this in both elevated and nonelevated
-  ; PostUpdate: The highest privileged run will win out, so the task can
-  ; run as Local Service if it was ever possible to register it that way.
-  ${PushRegisterUpdateAgentTaskCommand} "update"
-  Pop $0
-  ${If} "$0" != ""
-    nsExec::Exec $0
-    Pop $0
-  ${EndIf}
-!endif
-
 !ifdef MOZ_LAUNCHER_PROCESS
   ${ResetLauncherProcessDefaults}
 !endif
@@ -1403,7 +1384,6 @@
   Push "minidump-analyzer.exe"
   Push "pingsender.exe"
   Push "updater.exe"
-  Push "updateagent.exe"
   Push "${FileMainEXE}"
 !macroend
 !define PushFilesToCheck "!insertmacro PushFilesToCheck"
@@ -1668,44 +1648,3 @@ FunctionEnd
 !macroend
 !define ResetLauncherProcessDefaults "!insertmacro ResetLauncherProcessDefaults"
 !endif
-
-!ifdef MOZ_UPDATE_AGENT
-; Push, onto the stack, the command line used to register (or update) the
-; update agent scheduled task.
-;
-; InitHashAppModelId must have already been called to set $AppUserModelID,
-; if that is empty then an empty string will be pushed instead.
-;
-; COMMAND_BASE must be "register" or "update". Both will remove any
-; pre-existing task and register a new one, but "update" will first attempt
-; to copy some settings.
-!macro PushRegisterUpdateAgentTaskCommand COMMAND_BASE
-  Push $0
-  Push $1
-
-  Call IsUserAdmin
-  Pop $0
-  ; Register the update agent to run as Local Service if the user is an admin...
-  ${If} $0 == "true"
-  ; ...and if we have HKLM write access
-  ${AndIf} $TmpVal == "HKLM"
-    StrCpy $1 "${COMMAND_BASE}-task-local-service"
-  ${Else}
-    ; Otherwise attempt to register the task for the current user.
-    ; If we had previously registered the task while elevated, then we shouldn't
-    ; be able to replace it now with another task of the same name, so this
-    ; will fail harmlessly.
-    StrCpy $1 "${COMMAND_BASE}-task"
-  ${EndIf}
-
-  ${If} "$AppUserModelID" != ""
-    StrCpy $0 '"$INSTDIR\updateagent.exe" $1 "${UpdateAgentFullName} $AppUserModelID" "$AppUserModelID" "$INSTDIR"'
-  ${Else}
-    StrCpy $0 ''
-  ${EndIf}
-
-  Pop $1
-  Exch $0
-!macroend
-!define PushRegisterUpdateAgentTaskCommand "!insertmacro PushRegisterUpdateAgentTaskCommand"
-!endif

browser/installer/windows/nsis/uninstaller.nsi

@@ -453,11 +453,6 @@ Section "Uninstall"
   DeleteRegValue HKCU ${MOZ_LAUNCHER_SUBKEY} "$INSTDIR\${FileMainEXE}|Telemetry"
 !endif
 
-!ifdef MOZ_UPDATE_AGENT
-  ; Unregister the update agent
-  nsExec::Exec '"$INSTDIR\updateagent.exe" unregister-task "${UpdateAgentFullName} $AppUserModelID"'
-!endif
-
   ${un.RemovePrecompleteEntries} "false"
 
   ${If} ${FileExists} "$INSTDIR\defaults\pref\channel-prefs.js"