Deprecate and re-wire the ClearSiteDataOnExit policy.

chrome/browser/policy/configuration_policy_handler_list.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_list.h"
 
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_handler.h"
 #include "chrome/browser/policy/policy_error_map.h"
@@ skipping 78 matching lines @@
     Value::TYPE_LIST },
   { key::kEnabledPlugins,
     prefs::kPluginsEnabledPlugins,
     Value::TYPE_LIST },
   { key::kShowHomeButton,
     prefs::kShowHomeButton,
     Value::TYPE_BOOLEAN },
   { key::kSavingBrowserHistoryDisabled,
     prefs::kSavingBrowserHistoryDisabled,
     Value::TYPE_BOOLEAN },
-  { key::kClearSiteDataOnExit,
-    prefs::kClearSiteDataOnExit,
-    Value::TYPE_BOOLEAN },
   { key::kDeveloperToolsDisabled,
     prefs::kDevToolsDisabled,
     Value::TYPE_BOOLEAN },
   { key::kBlockThirdPartyCookies,
     prefs::kBlockThirdPartyCookies,
     Value::TYPE_BOOLEAN },
   { key::kDefaultCookiesSetting,
     prefs::kManagedDefaultCookiesSetting,
     Value::TYPE_INTEGER },
   { key::kDefaultImagesSetting,
@@ skipping 205 matching lines @@
                                 kSimplePolicyMap[i].preference_path,
                                 kSimplePolicyMap[i].value_type));
   }
 
   handlers_.push_back(new AutofillPolicyHandler());
   handlers_.push_back(new DefaultSearchPolicyHandler());
   handlers_.push_back(new DiskCacheDirPolicyHandler());
   handlers_.push_back(new FileSelectionDialogsHandler());
   handlers_.push_back(new IncognitoModePolicyHandler());
   handlers_.push_back(new JavascriptPolicyHandler());
+  handlers_.push_back(new ClearSiteDataOnExitPolicyHandler());

[Joao da Silva, 2012/06/19 10:23:55]

Nit: these were in alphabetical order.

[Mattias Nissler (ping if slow), 2012/06/20 08:15:40]

Done.

   handlers_.push_back(new ProxyPolicyHandler());
   handlers_.push_back(new RestoreOnStartupPolicyHandler());
   handlers_.push_back(new SyncPolicyHandler());
 
   handlers_.push_back(
       new ExtensionListPolicyHandler(key::kExtensionInstallWhitelist,
                                      prefs::kExtensionInstallAllowList,
                                      false));
   handlers_.push_back(
       new ExtensionListPolicyHandler(key::kExtensionInstallBlacklist,
@@ skipping 48 matching lines @@
 }
 
 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
     PolicyMap* policies) const {
   std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
   for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
     (*handler)->PrepareForDisplaying(policies);
 }
 
 }  // namespace policy