Retire ClearSiteDataOnExit policy.

chrome/browser/policy/configuration_policy_handler.cc

Index: chrome/browser/policy/configuration_policy_handler.cc
diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc
index ebe09be2e7a447ee0f63867abdbb3d7ce0e5ed3a..f9a34851510898f55fd982f861047e3c13f302b1 100644
--- a/chrome/browser/policy/configuration_policy_handler.cc
+++ b/chrome/browser/policy/configuration_policy_handler.cc
@@ -1392,71 +1392,6 @@ void JavascriptPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
   }
 }
 
-// ClearSiteDataOnExitPolicyHandler implementation -----------------------------
-
-ClearSiteDataOnExitPolicyHandler::ClearSiteDataOnExitPolicyHandler()
-    : TypeCheckingPolicyHandler(key::kClearSiteDataOnExit,
-                                Value::TYPE_BOOLEAN) {
-}
-
-ClearSiteDataOnExitPolicyHandler::~ClearSiteDataOnExitPolicyHandler() {
-}
-
-bool ClearSiteDataOnExitPolicyHandler::CheckPolicySettings(
-    const PolicyMap& policies,
-    PolicyErrorMap* errors) {
-  ContentSetting content_setting = CONTENT_SETTING_DEFAULT;
-  if (ClearSiteDataEnabled(policies) &&
-      GetContentSetting(policies, &content_setting) &&
-      content_setting == CONTENT_SETTING_ALLOW) {
-    errors->AddError(key::kDefaultCookiesSetting,
-                     IDS_POLICY_OVERRIDDEN,
-                     policy_name());
-  }
-
-  return TypeCheckingPolicyHandler::CheckPolicySettings(policies, errors);
-}
-
-void ClearSiteDataOnExitPolicyHandler::ApplyPolicySettings(
-    const PolicyMap& policies,
-    PrefValueMap* prefs) {
-  if (ClearSiteDataEnabled(policies)) {
-    ContentSetting content_setting = CONTENT_SETTING_DEFAULT;
-    if (!GetContentSetting(policies, &content_setting) ||
-        content_setting == CONTENT_SETTING_ALLOW) {
-      prefs->SetValue(
-          prefs::kManagedDefaultCookiesSetting,
-          Value::CreateIntegerValue(CONTENT_SETTING_SESSION_ONLY));
-    }
-  }
-}
-
-bool ClearSiteDataOnExitPolicyHandler::ClearSiteDataEnabled(
-    const PolicyMap& policies) {
-  const base::Value* value = NULL;
-  PolicyErrorMap errors;
-  bool clear_site_data = false;
-
-  return (CheckAndGetValue(policies, &errors, &value) &&
-          value &&
-          value->GetAsBoolean(&clear_site_data) &&
-          clear_site_data);
-}
-
-// static
-bool ClearSiteDataOnExitPolicyHandler::GetContentSetting(
-    const PolicyMap& policies,
-    ContentSetting* content_setting) {
-  const base::Value* value = policies.GetValue(key::kDefaultCookiesSetting);
-  int setting = CONTENT_SETTING_DEFAULT;
-  if (value && value->GetAsInteger(&setting)) {
-    *content_setting = static_cast<ContentSetting>(setting);
-    return true;
-  }
-
-  return false;
-}
-
 // RestoreOnStartupPolicyHandler implementation --------------------------------
 
 RestoreOnStartupPolicyHandler::RestoreOnStartupPolicyHandler()