backing out due to tinderbox orange.

git-svn-id: svn://10.0.0.236/trunk@239450 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/app/profile/firefox.js

@@ -340,7 +340,7 @@ pref("privacy.sanitize.promptOnSanitize", true);
 
 pref("network.proxy.share_proxy_settings",  false); // use the same proxy settings for all protocols
 
-pref("network.cookie.cookieBehavior",       2); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
+pref("network.cookie.cookieBehavior",       0); // cookies enabled
 pref("network.cookie.enableForCurrentSessionOnly", false);
 
 // l12n and i18n

mozilla/browser/components/preferences/privacy.js

@@ -160,6 +160,7 @@ var gPrivacyPane = {
    *     1   means allow cookies from the "originating" server only; see
    *         netwerk/cookie/src/nsCookieService.cpp for a hairier definition
    *     2   means disable all cookies
+   *     3   means use P3P policy to decide, which is probably broken
    * network.cookie.lifetimePolicy
    * - determines how long cookies are stored:
    *     0   means keep cookies until they expire
@@ -193,7 +194,7 @@ var gPrivacyPane = {
   writeAcceptCookies: function ()
   {
     var checkbox = document.getElementById("acceptCookies");
-    return checkbox.checked ? 1 : 2;
+    return checkbox.checked ? 0 : 2;
   },
 
   /**