Backed out changeset f1a3a13b5ab4 (bug 552434) for browser-chrome failures a=backout

browser/app/profile/firefox.js

@@ -501,8 +501,6 @@ pref("privacy.cpd.offlineApps",             false);
 pref("privacy.cpd.siteSettings",            false);
 pref("privacy.cpd.openWindows",             false);
 
-pref("privacy.history.custom",              false);
-
 // What default should we use for the time span in the sanitizer:
 // 0 - Clear everything
 // 1 - Last Hour

browser/components/preferences/in-content/privacy.js

@@ -287,9 +287,7 @@ var gPrivacyPane = {
     let mode;
     let getVal = aPref => document.getElementById(aPref).value;
 
-    if (getVal("privacy.history.custom"))
-      mode = "custom";
-    else if (this._checkHistoryValues(this.prefsForKeepingHistory)) {
+    if (this._checkHistoryValues(this.prefsForKeepingHistory)) {
       if (getVal("browser.privatebrowsing.autostart"))
         mode = "dontremember";
       else
@@ -319,7 +317,6 @@ var gPrivacyPane = {
       break;
     }
     document.getElementById("historyPane").selectedIndex = selectedIndex;
-    document.getElementById("privacy.history.custom").value = selectedIndex == 2;
   },
 
   /**

browser/components/preferences/in-content/privacy.xul

@@ -52,9 +52,6 @@
   <preference id="browser.formfill.enable"
               name="browser.formfill.enable"
               type="bool"/>
-  <preference id="privacy.history.custom"
-              name="privacy.history.custom"
-              type="bool"/>
   <!-- Cookies -->
   <preference id="network.cookie.cookieBehavior"
               name="network.cookie.cookieBehavior"

browser/components/preferences/in-content/tests/browser_cookies_exceptions.js

@@ -331,10 +331,6 @@ var testRunner = {
         },
       };
 
-      registerCleanupFunction(function() {
-        Services.prefs.clearUserPref("privacy.history.custom");
-      });
-
       openPreferencesViaOpenPreferencesAPI("panePrivacy", null, {leaveOpen: true}).then(function() {
         let doc = gBrowser.contentDocument;
         let historyMode = doc.getElementById("historyMode");

browser/components/preferences/in-content/tests/browser_privacypane_3.js

@@ -11,7 +11,7 @@ loader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
 run_test_subset([
   test_custom_retention("rememberHistory", "remember"),
   test_custom_retention("rememberHistory", "custom"),
+  test_custom_retention("rememberForms", "remember"),
   test_custom_retention("rememberForms", "custom"),
-  test_custom_retention("rememberForms", "custom"),
-  test_historymode_retention("remember", "custom"),
+  test_historymode_retention("remember", "remember"),
 ]);

browser/components/preferences/in-content/tests/browser_privacypane_4.js

@@ -14,12 +14,12 @@ let runtime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
 run_test_subset([
   test_custom_retention("acceptCookies", "remember"),
   test_custom_retention("acceptCookies", "custom"),
-  test_custom_retention("acceptThirdPartyMenu", "custom", "visited"),
+  test_custom_retention("acceptThirdPartyMenu", "remember", "visited"),
   test_custom_retention("acceptThirdPartyMenu", "custom", "always"),
-  test_custom_retention("keepCookiesUntil", "custom", 1),
+  test_custom_retention("keepCookiesUntil", "remember", 1),
   test_custom_retention("keepCookiesUntil", "custom", 2),
   test_custom_retention("keepCookiesUntil", "custom", 0),
+  test_custom_retention("alwaysClear", "remember"),
   test_custom_retention("alwaysClear", "custom"),
-  test_custom_retention("alwaysClear", "custom"),
-  test_historymode_retention("remember", "custom"),
+  test_historymode_retention("remember", "remember"),
 ]);