[tor-commits] [tor-browser] 05/06: fixup! Bug 40933: Add tor-launcher functionality

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2
in repository tor-browser.

commit e30289861b525e7e86ec670a24dc0ddc0b08a01d
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu Nov 17 18:31:51 2022 +0100

    fixup! Bug 40933: Add tor-launcher functionality
    
    Bug 41460: Removed the references to the meek profile
---
 .../components/tor-launcher/TorLauncherUtil.jsm    | 34 ----------------------
 .../components/tor-launcher/TorStartupService.jsm  |  6 ----
 2 files changed, 40 deletions(-)

diff --git a/toolkit/components/tor-launcher/TorLauncherUtil.jsm b/toolkit/components/tor-launcher/TorLauncherUtil.jsm
index 798040fa3abf..668d94669e5b 100644
--- a/toolkit/components/tor-launcher/TorLauncherUtil.jsm
+++ b/toolkit/components/tor-launcher/TorLauncherUtil.jsm
@@ -560,40 +560,6 @@ const TorLauncherUtil = Object.freeze({
     }
   },
 
-  removeMeekAndMoatHelperProfiles() {
-    // FIXME: Is this something we can remove?
-    const removeDirectory = (aParentDir, aName) => {
-      try {
-        const dir = aParentDir.clone();
-        dir.appendRelativePath(aName);
-        if (dir.exists()) {
-          dir.remove(true);
-        }
-      } catch (e) {
-        console.error(`Failed to remove ${aName}:`, e);
-      }
-    };
-
-    const kPrefRemoveHelperProfiles =
-      "extensions.torlauncher.should_remove_meek_helper_profiles";
-    if (Services.prefs.getBoolPref(kPrefRemoveHelperProfiles, false)) {
-      try {
-        // Only attempt removal once.
-        Services.prefs.setBoolPref(kPrefRemoveHelperProfiles, false);
-      } catch (e) {
-        console.warn(`Could not set ${kPrefRemoveHelperProfiles}`, e);
-      }
-
-      if (this.isMac) {
-        let ptProfilesDir = this.getTorFile("pt-profiles-dir", true);
-        if (ptProfilesDir) {
-          removeDirectory(ptProfilesDir, "profile.meek-http-helper");
-          removeDirectory(ptProfilesDir, "profile.moat-http-helper");
-        }
-      }
-    }
-  },
-
   get _stringBundle() {
     if (!gStringBundle) {
       gStringBundle = Services.strings.createBundle(kPropBundleURI);
diff --git a/toolkit/components/tor-launcher/TorStartupService.jsm b/toolkit/components/tor-launcher/TorStartupService.jsm
index 539c599aec62..c1bbfda19ea3 100644
--- a/toolkit/components/tor-launcher/TorStartupService.jsm
+++ b/toolkit/components/tor-launcher/TorStartupService.jsm
@@ -67,12 +67,6 @@ class TorStartupService {
     TorSettings.init();
     TorConnect.init();
 
-    try {
-      TorLauncherUtil.removeMeekAndMoatHelperProfiles();
-    } catch (e) {
-      console.warn("Failed to remove meek and moat profiles", e);
-    }
-
     gInited = true;
   }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.