[tor-commits] [torbutton/master] Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate

[gk at torproject.org]

commit 053c98697a4b00171a31e86399137ecb6f47ddfc
Author: Alex Catarineu <acat at torproject.org>
Date:   Mon Apr 15 11:34:27 2019 +0200

    Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate
---
 src/chrome/content/torbutton.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 6ea51190..74d83734 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -141,15 +141,6 @@ var torbutton_unique_pref_observer =
         if (topic != "nsPref:changed") return;
 
         switch (data) {
-            case "network.cookie.cookieBehavior":
-                let val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior");
-                let firstparty_isolate = m_tb_prefs.getBoolPref("privacy.firstparty.isolate");
-                if (val == 0 && firstparty_isolate) // Allow all cookies
-                  m_tb_prefs.setBoolPref("privacy.firstparty.isolate", false);
-                else if (val == 1 && !firstparty_isolate) // Block third party cookies
-                  m_tb_prefs.setBoolPref("privacy.firstparty.isolate", true);
-                break;
-
             case "plugin.disable":
                 torbutton_toggle_plugins(
                         m_tb_prefs.getBoolPref("plugin.disable"));
@@ -1587,12 +1578,6 @@ function torbutton_update_fingerprinting_prefs() {
 function torbutton_update_isolation_prefs() {
     let isolate = m_tb_prefs.getBoolPref("privacy.firstparty.isolate");
 
-    if (isolate) {
-      m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 1);
-    } else {
-      m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0);
-    }
-
     m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate);
 
     // Force prefs to be synced to disk