[tor-commits] [torbutton/master] Bug 8423: Don't clear cookies at shutdown if user wants disk history

[mikeperry at torproject.org]

commit 7e5486a7a05e26fc9449e79170ac22b90ad47a6f
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Mar 6 18:30:26 2013 -0800

    Bug 8423: Don't clear cookies at shutdown if user wants disk history
    
    We'll let them tweak the Firefox prefs for this.
---
 src/components/startup-observer.js |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js
index c3b4251..d7b7bcd 100644
--- a/src/components/startup-observer.js
+++ b/src/components/startup-observer.js
@@ -184,23 +184,6 @@ StartupObserver.prototype = {
             }
         }
 
-        if((this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 1 && 
-            this._prefs.getBoolPref("extensions.torbutton.tor_enabled"))
-            || this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) {
-            var selector =
-                Components.classes["@torproject.org/cookie-jar-selector;1"]
-                .getService(Components.interfaces.nsISupports)
-                .wrappedJSObject;
-            selector.clearCookies();
-            // clear the cookie jar by saving the empty cookies to it.
-            if(this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) {
-                if(this._prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
-                    selector.saveCookies("tor");
-                selector.saveCookies("nontor");
-            } else if(this._prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) {
-                selector.saveCookies("tor");
-            }
-        }
         this.logger.log(3, "Torbutton normal exit.");
         //this.unregister();
       }