From 9f7b943c1de5e9ae010ff839ee7e601a081d42e1 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 14 Aug 2019 17:19:40 +0200
Subject: Issue #1124: Remove Firefox Developer Edition code.

Removes all occurrences of MOZ_DEV_EDITION code and some helpers.
---
 toolkit/profile/nsToolkitProfileService.cpp | 43 -----------------------------
 1 file changed, 43 deletions(-)

(limited to 'toolkit/profile')

diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
index 38b3a37f1..e818d27e6 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -425,22 +425,6 @@ nsToolkitProfileService::Init()
 
     nsToolkitProfile* currentProfile = nullptr;
 
-#ifdef MOZ_DEV_EDITION
-    nsCOMPtr<nsIFile> ignoreSeparateProfile;
-    rv = mAppData->Clone(getter_AddRefs(ignoreSeparateProfile));
-    if (NS_FAILED(rv))
-        return rv;
-
-    rv = ignoreSeparateProfile->AppendNative(NS_LITERAL_CSTRING("ignore-dev-edition-profile"));
-    if (NS_FAILED(rv))
-        return rv;
-
-    bool shouldIgnoreSeparateProfile;
-    rv = ignoreSeparateProfile->Exists(&shouldIgnoreSeparateProfile);
-    if (NS_FAILED(rv))
-        return rv;
-#endif
-
     unsigned int c = 0;
     bool foundAuroraDefault = false;
     for (c = 0; true; ++c) {
@@ -501,35 +485,8 @@ nsToolkitProfileService::Init()
             mChosen = currentProfile;
             this->SetDefaultProfile(currentProfile);
         }
-#ifdef MOZ_DEV_EDITION
-        // Use the dev-edition-default profile if this is an Aurora build and
-        // ignore-dev-edition-profile is not present.
-        if (name.EqualsLiteral("dev-edition-default") && !shouldIgnoreSeparateProfile) {
-            mChosen = currentProfile;
-            foundAuroraDefault = true;
-        }
-#endif
     }
 
-#ifdef MOZ_DEV_EDITION
-    if (!foundAuroraDefault && !shouldIgnoreSeparateProfile) {
-        // If a single profile exists, it may not be already marked as default.
-        // Do it now to avoid problems when we create the dev-edition-default profile.
-        if (!mChosen && mFirst && !mFirst->mNext)
-            this->SetDefaultProfile(mFirst);
-
-        // Create a default profile for aurora, if none was found.
-        nsCOMPtr<nsIToolkitProfile> profile;
-        rv = CreateProfile(nullptr,
-                           NS_LITERAL_CSTRING("dev-edition-default"),
-                           getter_AddRefs(profile));
-        if (NS_FAILED(rv)) return rv;
-        mChosen = profile;
-        rv = Flush();
-        if (NS_FAILED(rv)) return rv;
-    }
-#endif
-
     if (!mChosen && mFirst && !mFirst->mNext) // only one profile
         mChosen = mFirst;
     return NS_OK;
-- 
cgit v1.2.3