Allow content setting changes in incognito mode.

This removes the logic to disable the "remeber" functions in the UI elements (basically reverting r44084, but leaves the incognito host content setting map in place. Changes to this map are allowed but do not get stored in preferences.

BUG=44480
TEST=none

Review URL: http://codereview.chromium.org/2811025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50829 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/chrome/browser/cookie_modal_dialog.cc b/chrome/browser/cookie_modal_dialog.cc
index ed86178..575ace5 100644
--- a/chrome/browser/cookie_modal_dialog.cc
+++ b/chrome/browser/cookie_modal_dialog.cc
@@ -99,8 +99,7 @@ bool CookiePromptModalDialog::IsValid() {
 
 void CookiePromptModalDialog::AllowSiteData(bool remember,
                                             bool session_expire) {
-  DCHECK(!remember || DecisionPersistable());
-  if (remember && DecisionPersistable()) {
+  if (remember) {
     // Make sure there is no entry that would override the pattern we are about
     // to insert for exactly this URL.
     host_content_settings_map_->SetContentSetting(
@@ -118,8 +117,7 @@ void CookiePromptModalDialog::AllowSiteData(bool remember,
 }
 
 void CookiePromptModalDialog::BlockSiteData(bool remember) {
-  DCHECK(!remember || DecisionPersistable());
-  if (remember && DecisionPersistable()) {
+  if (remember) {
     // Make sure there is no entry that would override the pattern we are about
     // to insert for exactly this URL.
     host_content_settings_map_->SetContentSetting(
@@ -146,7 +144,3 @@ int CookiePromptModalDialog::GetDialogButtons() {
   return MessageBoxFlags::DIALOGBUTTON_OK |
          MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
-
-bool CookiePromptModalDialog::DecisionPersistable() {
-  return !host_content_settings_map_->IsOffTheRecord();
-}