Bug 1520617: LauncherRegistryInfo - when the image timestamp changes, only avoid clearing start timestamps when force disabled; r=mhowell

Differential Revision: https://phabricator.services.mozilla.com/D16752

--HG--
extra : moz-landing-system : lando

toolkit/xre/LauncherRegistryInfo.cpp

@@ -338,10 +338,10 @@ LauncherResult<bool> LauncherRegistryInfo::ClearStartTimestamp(
 }
 
 LauncherVoidResult LauncherRegistryInfo::ClearStartTimestamps() {
-  LauncherResult<uint64_t> lastBrowserTimestamp =
-      GetStartTimestamp(ProcessType::Browser);
-  if (lastBrowserTimestamp.isOk() && lastBrowserTimestamp.unwrap() == 0ULL) {
-    // Only proceed when the browser timestamp is non-zero
+  LauncherResult<EnabledState> enabled = IsEnabled();
+  if (enabled.isOk() && enabled.unwrap() == EnabledState::ForceDisabled) {
+    // We don't clear anything when we're force disabled - we need to maintain
+    // the current registry state in this case.
     return Ok();
   }