Backed out changeset 455e57b39067 from bug 1530615 for causing bug 1534186. r=backout
authorDave Townsend <dtownsend@oxymoronical.com>
Mon, 11 Mar 2019 08:43:20 -0700
changeset 521358 0d5adb2cf4c9
parent 521357 a298dcb1bc36
child 521359 3a116fa47aff
push id10866
push usernerli@mozilla.com
push dateTue, 12 Mar 2019 18:59:09 +0000
treeherdermozilla-beta@445c24a51727 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1530615, 1534186
milestone67.0a1
backs out455e57b39067
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 455e57b39067 from bug 1530615 for causing bug 1534186. r=backout
toolkit/content/aboutProfiles.js
toolkit/profile/content/profileSelection.js
--- a/toolkit/content/aboutProfiles.js
+++ b/toolkit/content/aboutProfiles.js
@@ -326,31 +326,10 @@ function restart(safeMode) {
   if (safeMode) {
     Services.startup.restartInSafeMode(flags);
   } else {
     Services.startup.quit(flags);
   }
 }
 
 window.addEventListener("DOMContentLoaded", function() {
-  // Check if any profiles are missing on the disk and if so remove them.
-  // We cannot remove profiles while iterating the list returned from the
-  // profile service, so convert it to a new array first.
-  try {
-    let changed = false;
-    for (let profile of [...ProfileService.profiles]) {
-      if (!profile.rootDir.exists() || !profile.rootDir.isDirectory()) {
-        profile.remove(false);
-        changed = true;
-      }
-    }
-
-    if (changed) {
-      ProfileService.flush();
-    }
-  } catch (e) {
-    // There shouldn't be any failures to catch here, but just in case let the
-    // UI build itself properly.
-    Cu.reportError(e);
-  }
-
   refreshUI();
 }, {once: true});
--- a/toolkit/profile/content/profileSelection.js
+++ b/toolkit/profile/content/profileSelection.js
@@ -19,33 +19,16 @@ var gProfileService;
 
 function startup() {
   try {
     gDialogParams = window.arguments[0].
       QueryInterface(I.nsIDialogParamBlock);
 
     gProfileService = C[ToolkitProfileService].getService(I.nsIToolkitProfileService);
 
-    // Check if any profiles are missing on the disk and if so remove them.
-    // We cannot remove profiles while iterating the list returned from the
-    // profile service, so convert it to a new array first.
-    try {
-      for (let profile of [...gProfileService.profiles]) {
-        if (!profile.rootDir.exists() || !profile.rootDir.isDirectory()) {
-          profile.remove(false);
-        }
-      }
-
-      // The profile service is always flushed after this dialog completes.
-    } catch (e) {
-      // There shouldn't be any failures to catch here, but just in case let the
-      // UI build itself properly.
-      Cu.reportError(e);
-    }
-
     gProfileManagerBundle = document.getElementById("bundle_profileManager");
     gBrandBundle = document.getElementById("bundle_brand");
 
     document.documentElement.centerWindowOnScreen();
 
     var profilesElement = document.getElementById("profiles");
 
     for (let profile of gProfileService.profiles.entries(I.nsIToolkitProfile)) {