Deprecate and re-wire the ClearSiteDataOnExit policy.

chrome/browser/policy/configuration_policy_handler_unittest.cc

Index: chrome/browser/policy/configuration_policy_handler_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_unittest.cc b/chrome/browser/policy/configuration_policy_handler_unittest.cc
index baba2ba1382f7bdcd787cf99bb11f311f637d667..cf0c9fefaa3136b3020b0db21dbe0ee2f1ff8d4f 100644
--- a/chrome/browser/policy/configuration_policy_handler_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_handler_unittest.cc
@@ -22,24 +22,28 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
 
   policy_map.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("abcdefghijklmnopabcdefghijklmnop"));
   policy_map.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("*"));
   policy_map.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("invalid"));
   policy_map.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
   EXPECT_FALSE(errors.GetErrors(key::kExtensionInstallBlacklist).empty());
@@ -72,24 +76,28 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
 
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("http://*.google.com/*"));
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("<all_urls>"));
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   list.Append(Value::CreateStringValue("invalid"));
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
   EXPECT_FALSE(errors.GetErrors(key::kExtensionInstallSources).empty());
@@ -99,6 +107,7 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
   list.Append(Value::CreateStringValue("*"));
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
+  errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
   EXPECT_FALSE(errors.GetErrors(key::kExtensionInstallSources).empty());
@@ -117,8 +126,61 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
   policy_map.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, list.DeepCopy());
   handler.ApplyPolicySettings(policy_map, &prefs);
-  EXPECT_TRUE(prefs.GetValue(prefs::kExtensionAllowedInstallSites, &value));
+  ASSERT_TRUE(prefs.GetValue(prefs::kExtensionAllowedInstallSites, &value));
   EXPECT_TRUE(base::Value::Equals(&list, value));
 }
 
+TEST(ClearSiteDataOnExitPolicyHandlerTest, CheckPolicySettings) {
+  ClearSiteDataOnExitPolicyHandler handler;
+  PolicyMap policy_map;
+  PolicyErrorMap errors;
+
+  EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
+  EXPECT_TRUE(errors.empty());
+
+  policy_map.Set(key::kClearSiteDataOnExit, POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
+  errors.Clear();
+  EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
+  EXPECT_TRUE(errors.empty());
+
+  policy_map.Set(key::kDefaultCookiesSetting, POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+  errors.Clear();
+  EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
+  EXPECT_FALSE(errors.empty());
+  EXPECT_FALSE(errors.GetErrors(key::kDefaultCookiesSetting).empty());
+}
+
+TEST(ClearSiteDataOnExitPolicyHandlerTest, ApplyPolicySettings) {
+  ClearSiteDataOnExitPolicyHandler handler;
+  PolicyMap policy_map;
+  PrefValueMap prefs;
+  const base::Value* val = NULL;
+
+  handler.ApplyPolicySettings(policy_map, &prefs);
+  EXPECT_FALSE(prefs.GetValue(prefs::kManagedDefaultCookiesSetting, &val));
+
+  policy_map.Set(key::kClearSiteDataOnExit, POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
+  prefs.Clear();
+  handler.ApplyPolicySettings(policy_map, &prefs);
+  ASSERT_TRUE(prefs.GetValue(prefs::kManagedDefaultCookiesSetting, &val));
+  EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_SESSION_ONLY).Equals(val));
+
+  policy_map.Set(key::kDefaultCookiesSetting, POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+  prefs.Clear();
+  handler.ApplyPolicySettings(policy_map, &prefs);
+  ASSERT_TRUE(prefs.GetValue(prefs::kManagedDefaultCookiesSetting, &val));
+  EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_SESSION_ONLY).Equals(val));
+
+  policy_map.Clear();
+  prefs.Clear();
+  handler.ApplyPolicySettings(policy_map, &prefs);
+  EXPECT_FALSE(prefs.GetValue(prefs::kManagedDefaultCookiesSetting, &val));
+}
+
 }  // namespace policy