Deprecate and re-wire the ClearSiteDataOnExit policy.

chrome/app/policy/policy_templates.json

 {
 # policy_templates.json - Metafile for policy templates
 #
 # The content of this file is evaluated as a Python expression.
 #
 # This file is used as input to generate the following policy templates:
 # ADM, ADMX+ADML, MCX/plist and html documentation.
 #
 # Policy templates are user interface definitions or documents about the
 # policies that can be used to configure Chrome. Each policy is a name-value
@@ skipping 725 matching lines @@
       'label': '''Set download directory''',
     },
     {
       'name': 'ClearSiteDataOnExit',
       'type': 'main',
       'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
       'features': {
         'dynamic_refresh': True,
         'can_be_recommended': True,
       },
+      'deprecated': True,
       'example_value': True,
       'id': 65,
-      'caption': '''Clear site data on browser shutdown''',
-      'desc': '''This policy is an override for the "Clear cookies and other site data when I close my browser" content settings option.
+      'caption': '''Clear site data on browser shutdown (deprecated)''',
+      'desc': '''This policy is an override for the "Clear cookies and other site data when I close my browser" content settings option that <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> supported prior to version 21.
 
-      When set to enabled <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will delete all locally stored data from the browser when it is shut down.
+      This policy exists only for backward-compatibility and will go away in the future. The recommended way to clear site data on exit on version 21 and later is to configure the DefaultCookiesSetting policy to session-only.
 
-      If set to disabled site data will not be cleared on exit.
+      If this policy is enabled, will be translated to the appropriate policy setting for the DefaultCookiesSetting policy, setting it to session-only if the DefaultCookiesSetting policy is not configured or set to Allow.

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

Nit: "If this policy is enable, _it_ will be ..."

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

Done.

 
-      If this policy is left not set <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will use the default which is to preserve site data on shut down and the user will be able to change this.
-
-      If the "RestoreOnStartup" policy is set to restore URLs from previous sessions this policy will not clear cookies or other data relevant to restoring the previous browsing session completely.''',
-      'label': '''Clear site data on browser shutdown''',
+      If this policy is disabled or left unconfigured the policy for storing site data is determined by the DefaultCookiesSetting policy.''',
+      'label': '''Clear site data on browser shutdown (deprecated)''',
     },
     {
       'name': 'Proxy',
       'type': 'group',
       'caption': '''Proxy server''',
       'desc': '''Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
 
       If you choose to never use a proxy server and always connect directly, all other options are ignored.
 
       If you choose to auto detect the proxy server, all other options are ignored.
@@ skipping 612 matching lines @@
             {
               'name': 'AllowCookies',
               'value': 1,
               'caption': '''Allow all sites to set local data.'''
             },
             {
               'name': 'BlockCookies',
               'value': 2,
               'caption': '''Do not allow any site to set local data'''
             },
+            {
+              'name': 'SessionOnly',
+              'value': 4,
+              'caption': '''Keep cookies for the duration of the session.'''
+            },
           ],
           'supported_on': ['chrome.*:10-', 'chrome_os:0.11-'],
           'features': {'dynamic_refresh': True},
           'example_value': 1,
           'id': 48,
           'caption': '''Default cookies setting''',
           'desc': '''Allows you to set whether websites are allowed to set local data. Setting local data can be either allowed for all websites or denied for all websites.
 
           If this policy is left not set, 'AllowCookies' will be used and the user will be able to change it.''',
         },
@@ skipping 1402 matching lines @@
       'desc': '''Text appended in parentheses to the policy name to indicate that it has been deprecated''',
       'text': 'deprecated',
     },
     'doc_recommended': {
       'desc': '''Text appended in parentheses next to the policies top-level container to indicate that those policies are of the Recommended level''',
       'text': 'Recommended',
     },
   },
   'placeholders': [],
 }