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 463467 0d5adb2cf4c9cb73fec05a4daf680938238e6283
parent 463466 a298dcb1bc36f0087dab0c26ee170d87d86c23b8
child 463468 3a116fa47aff225e3760e3ec4fd6cf12e9721fdb
push id35684
push useropoprus@mozilla.com
push dateMon, 11 Mar 2019 21:54:35 +0000
treeherdermozilla-central@52b03bc34899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1530615, 1534186
milestone67.0a1
backs out455e57b39067641e9a675116e96c3026c30b89f8
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)) {