Deprecate and re-wire the ClearSiteDataOnExit policy.

chrome/browser/policy/configuration_policy_handler.h

Index: chrome/browser/policy/configuration_policy_handler.h
diff --git a/chrome/browser/policy/configuration_policy_handler.h b/chrome/browser/policy/configuration_policy_handler.h
index 6b75800f0ad32344a23a65d8f30b79d5185bd9a4..73913d7f42a90fc1ab1ead263ab9952098de845d 100644
--- a/chrome/browser/policy/configuration_policy_handler.h
+++ b/chrome/browser/policy/configuration_policy_handler.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
+#include "chrome/common/content_settings.h"
 
 class PrefValueMap;
 
@@ -355,6 +356,31 @@ class JavascriptPolicyHandler : public ConfigurationPolicyHandler {
   DISALLOW_COPY_AND_ASSIGN(JavascriptPolicyHandler);
 };
 
+// Handles the (deprecated) ClearSiteDataOnExit policy.
+// TODO(mnissler): Remove the policy eventually (http://crbug.com/133291).
+class ClearSiteDataOnExitPolicyHandler : public TypeCheckingPolicyHandler {
+ public:
+  ClearSiteDataOnExitPolicyHandler();
+  virtual ~ClearSiteDataOnExitPolicyHandler();
+
+  // ConfigurationPolicyHandler methods:
+  virtual bool CheckPolicySettings(const PolicyMap& policies,
+                                   PolicyErrorMap* errors) OVERRIDE;
+  virtual void ApplyPolicySettings(const PolicyMap& policies,
+                                   PrefValueMap* prefs) OVERRIDE;
+
+ private:
+  // Checks whether the clear site data policy is enabled in |policies|.
+  bool ClearSiteDataEnabled(const PolicyMap& policies);
+
+  // Checks |policies| for the cookies setting and returns it in
+  // |content_setting|. Returns true if the setting is found, false if not.
+  static bool GetContentSetting(const PolicyMap& policies,
+                                ContentSetting* content_setting);
+
+  DISALLOW_COPY_AND_ASSIGN(ClearSiteDataOnExitPolicyHandler);
+};
+
 // Handles RestoreOnStartup policy.
 class RestoreOnStartupPolicyHandler : public TypeCheckingPolicyHandler {
  public: