Deprecate and re-wire the ClearSiteDataOnExit policy.

chrome/browser/policy/configuration_policy_handler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/configuration_policy_handler.h"
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 #include "chrome/common/pref_names.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
   base::ListValue list;
   PolicyMap policy_map;
   PolicyErrorMap errors;
   ExtensionListPolicyHandler handler(key::kExtensionInstallBlacklist,
                                      prefs::kExtensionInstallDenyList,
                                      true);
 
   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());
 }
 
 TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
   base::ListValue list;
   PolicyMap policy_map;
   PrefValueMap prefs;
   base::Value* value = NULL;
@@ skipping 12 matching lines @@
 TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) {
   base::ListValue list;
   PolicyMap policy_map;
   PolicyErrorMap errors;
   ExtensionURLPatternListPolicyHandler handler(
       key::kExtensionInstallSources,
       prefs::kExtensionAllowedInstallSites);
 
   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());
 
   // URLPattern syntax has a different way to express 'all urls'. Though '*'
   // would be compatible today, it would be brittle, so we disallow.
   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());
 }
 
 TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
   base::ListValue list;
   PolicyMap policy_map;
   PrefValueMap prefs;
   base::Value* value = NULL;
   ExtensionURLPatternListPolicyHandler handler(
       key::kExtensionInstallSources,
       prefs::kExtensionAllowedInstallSites);
 
   list.Append(Value::CreateStringValue("https://corp.monkey.net/*"));
   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