Bug 1535367: Remove temporary migration code added in bug 1525119. r=froydnj
authorDave Townsend <dtownsend@oxymoronical.com>
Thu, 14 Mar 2019 19:03:56 +0000
changeset 524937 f72d9c9dbcf08cef5872047a16f8c5a0c4876840
parent 524936 2b18f28016cfe2aceb450afb585f8685f07dae5f
child 524938 49ebb69e88937a8eabf435f90f47c0d4cf28aed0
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1535367, 1525119
milestone67.0a1
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
Bug 1535367: Remove temporary migration code added in bug 1525119. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D23555
toolkit/profile/nsToolkitProfileService.cpp
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -1187,28 +1187,16 @@ nsresult nsToolkitProfileService::Select
   // None of the profiles was marked as default (generally only happens if the
   // user modifies profiles.ini manually). Let the user choose.
   if (!mCurrent) {
     return NS_ERROR_SHOW_PROFILE_MANAGER;
   }
 
   mStartupReason = NS_LITERAL_STRING("default");
 
-  // This code block can be removed before riding the trains to 68.
-  if (mUseDedicatedProfile) {
-    nsCString locked;
-    rv = mInstallData.GetString(mInstallHash.get(), "Locked", locked);
-    if (NS_FAILED(rv) || !locked.EqualsLiteral("1")) {
-      // The profile is unlocked. This can only happen if this profile was the
-      // old default profile and it was chosen as the dedicated default on a
-      // previous run. Check later if this is the default app and if so lock it.
-      mMaybeLockProfile = true;
-    }
-  }
-
   // Use the selected profile.
   mCurrent->GetRootDir(aRootDir);
   mCurrent->GetLocalDir(aLocalDir);
   NS_ADDREF(*aProfile = mCurrent);
 
   return NS_OK;
 }