Adding Keygen to Policy List

components/policy/resources/policy_templates.json

Index: components/policy/resources/policy_templates.json
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 5e23030364665fe059e25f59e5d2be269ffd062a..bad693ab7ac4b4736f4881f2cac64a0b153cb9f7 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -3053,6 +3053,38 @@
           If this policy is left not set, 'PromptOnAccess' will be used and the user will be able to change it.''',
         },
         {
+          'name': 'DefaultKeygenSetting',
+          'type': 'int-enum',
+          'schema': {
+            'type': 'integer',
+            'enum': [ 1, 2 ],
+          },
+          'items': [
+            {
+              'name': 'AllowKeygen',
+              'value': 1,
+              'caption': '''Allow all sites to use key generation''',
+            },
+            {
+              'name': 'BlockKeygen',
+              'value': 2,
+              'caption': '''Do not allow any site to use key generation''',
+            },
+          ],
+          'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'],

[Andrew T Wilson (Slow), 2016/01/15 11:00:01]

remove ios

+          'features': {
+            'dynamic_refresh': True,
+            'per_profile': True,
+          },
+          'example_value': 2,
+          'id': 313,
+          'caption': '''Default key generation setting''',
+          'tags': ['system-security', 'website-sharing', 'local-data-access'],
+          'desc': '''Allows you to set whether websites are allowed to use key generation. Using key generation can be either allowed for all websites or denied for all websites.
+
+          If this policy is left not set, 'BlockKeygen' will be used and the user will be able to change it.''',
+        },
+        {
           'name': 'AutoSelectCertificateForUrls',
           'type': 'list',
           'schema': {
@@ -3234,6 +3266,46 @@
           If this policy is left not set the global default value will be used for all sites either from the 'DefaultJavaScriptSetting' policy if it is set, or the user's personal configuration otherwise.''',
         },
         {
+          'name': 'KeygenAllowedForUrls',
+          'type': 'list',
+          'schema': {
+            'type': 'array',
+            'items': { 'type': 'string' },
+          },
+          'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'],

[Andrew T Wilson (Slow), 2016/01/15 11:00:01]

Remove ios

+          'features': {
+            'dynamic_refresh': True,
+            'per_profile': True,
+          },
+          'example_value': ['https://www.example.com', '[*.]example.edu'],
+          'id': 314,
+          'caption': '''Allow key generation on these sites''',
+          'tags': ['system-security', 'website-sharing', 'local-data-access'],
+          'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to use key generation.
+
+          If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.''',

[Andrew T Wilson (Slow), 2016/01/15 11:00:01]

Can you document how this interacts with KeygenBlockedForUrls (which takes
precedence)?

+        },
+        {
+          'name': 'KeygenBlockedForUrls',
+          'type': 'list',
+          'schema': {
+            'type': 'array',
+            'items': { 'type': 'string' },
+          },
+          'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'],

[Andrew T Wilson (Slow), 2016/01/15 11:00:01]

remove ios

+          'features': {
+            'dynamic_refresh': True,
+            'per_profile': True,
+          },
+          'example_value': ['https://www.example.com', '[*.]example.edu'],
+          'id': 315,
+          'caption': '''Block key generation on these sites''',
+          'tags': ['system-security', 'website-sharing', 'local-data-access'],
+          'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to use key generation.
+
+          If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.''',
+        },
+        {
           'name': 'PluginsAllowedForUrls',
           'type': 'list',
           'schema': {