Add a new policy to allow for release channel delegation.

chrome/app/policy/policy_templates.json

Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index b4d12fbe326f8ff7e79444763deb100824696bc7..fb6998efeff2c0ca279fad070b20b43c009dcb0e 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -112,7 +112,7 @@
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 133
+#   For your editing convenience: highest ID currently used: 134
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -1988,34 +1988,6 @@
       Leaving this policy not set will make <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> use the default value of 3 hours.''',
     },
     {
-      'name': 'ChromeOsReleaseChannel',
-      'type': 'string-enum',
-      'items': [
-        {
-          'name': 'StableChannel',
-          'value': 'stable-channel',
-          'caption': '''Stable channel'''
-        },
-        {
-          'name': 'BetaChannel',
-          'value': 'beta-channel',
-          'caption': '''Beta channel'''
-        },
-        {
-          'name': 'DevChannel',
-          'value': 'dev-channel',
-          'caption': '''Dev channel (may be unstable)'''
-        }
-      ],
-      'supported_on': ['chrome_os:0.11-'],
-      'device_only': True,
-      'features': {'dynamic_refresh': True},
-      'example_value': 'stable-channel',
-      'id': 91,
-      'caption': '''Release channel''',
-      'desc': '''Specifies the release channel that this device should be locked to.'''
-    },
-    {
       'name': 'ImportBookmarks',
       'type': 'main',
       'supported_on': ['chrome.*:15-'],
@@ -2411,6 +2383,46 @@
       'desc': '''Controls whether usage metrics are reported back to Google. If set to true, <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> will report usage metrics. If not configured or set to false, metrics reporting will be disabled.''',
     },
     {
+      'name': 'ChromeOsReleaseChannel',
+      'type': 'string-enum',
+      'items': [
+        {
+          'name': 'StableChannel',
+          'value': 'stable-channel',
+          'caption': '''Stable channel'''
+        },
+        {
+          'name': 'BetaChannel',
+          'value': 'beta-channel',
+          'caption': '''Beta channel'''
+        },
+        {
+          'name': 'DevChannel',
+          'value': 'dev-channel',
+          'caption': '''Dev channel (may be unstable)'''
+        }
+      ],
+      'supported_on': ['chrome_os:0.11-'],
+      'device_only': True,
+      'features': {'dynamic_refresh': True},
+      'example_value': 'stable-channel',
+      'id': 91,
+      'caption': '''Release channel''',
+      'desc': '''Specifies the release channel that this device should be locked to.'''
+    },
+    {
+      'name': 'ChromeOsReleaseChannelDelegated',
+      'type': 'main',
+      'supported_on': ['chrome_os:0.19-'],
+      'features': {'dynamic_refresh': True},
+      'example_value': False,
+      'id': 134,
+      'caption': '''Wether the release channel should be settable by the user or locked.''',
+      'desc': '''If this policy is set to True and the ChromeOsReleaseChannel policy is not specified the users of the enrolling domain will be allowed to change the release channel of the device. If this policy is set to false the device will be locked in whatever channel it was last set.
+
+      The user selected channel will be overriden by the ChromeOsReleaseChannel policy but if the policy channel is more stable than the one that was installed on the device, channel switch might will only after the version of the more stable channel reaches number higher than the one installed on the device.''',
+    },
+    {
       'name': 'DeviceEphemeralUsersEnabled',
       'type': 'main',
       'supported_on': ['chrome_os:19-'],