Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

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 34373e3b766303990561c46a619c2ee9491871ac..6c43a9ac5b767823c9ef98611cbe2e4765069d28 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -137,7 +137,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: 345
+#   For your editing convenience: highest ID currently used: 347
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -1092,13 +1092,13 @@
       'id': 162,
       'caption': '''Force SafeSearch''',
       'tags': ['filtering'],
-      'desc': '''This policy is deprecated, please use ForceGoogleSafeSearch and ForceYouTubeSafetyMode instead. This policy will be ignored if either the ForceGoogleSafeSearch or ForceYouTubeSafetyMode policies are set.
+      'desc': '''This policy is deprecated, please use <ph name="FORCEGOOGLESAFESEARCH_POLICY_NAME">ForceGoogleSafeSearch</ph> and <ph name="FORCEYOUTUBERESTRICT_POLICY_NAME">ForceYouTubeRestrict</ph> instead. This policy is ignored if either the <ph name="FORCEGOOGLESAFESEARCH_POLICY_NAME">ForceGoogleSafeSearch</ph>, the <ph name="FORCEYOUTUBERESTRICT_POLICY_NAME">ForceYouTubeRestrict</ph> or the (deprecated) <ph name="FORCEYOUTUBESAFETYMODE_POLICY_NAME">ForceYouTubeSafetyMode</ph> policies are set.
 
-      Forces queries in Google Web Search to be done with SafeSearch set to active and prevents users from changing this setting. This setting also forces Safety Mode on YouTube.
+      Forces queries in Google Web Search to be done with SafeSearch set to active and prevents users from changing this setting. This setting also forces Moderate Restricted Mode on YouTube.
 
-      If you enable this setting, SafeSearch in Google Search and YouTube is always active.
+      If you enable this setting, SafeSearch in Google Search and Moderate Restricted Mode YouTube is always active.
 
-      If you disable this setting or do not set a value, SafeSearch in Google Search and YouTube is not enforced.''',
+      If you disable this setting or do not set a value, SafeSearch in Google Search and Restricted Mode in YouTube is not enforced.''',
     },
     {
       'name': 'ForceGoogleSafeSearch',
@@ -1130,15 +1130,63 @@
         'dynamic_refresh': True,
         'per_profile': True,
       },
+      'deprecated': True,
       'example_value': False,
       'id': 283,
       'caption': '''Force YouTube Safety Mode''',
       'tags': ['filtering'],
-      'desc': '''Forces YouTube Safety Mode to active and prevents users from changing this setting.
+      'desc': '''This policy is deprecated. Consider using <ph name="FORCEYOUTUBERESTRICT_POLICY_NAME">ForceYouTubeRestrict</ph>, which allows more fine-grained tuning.
+
+      Forces YouTube Moderate Restricted Mode and prevents users from changing this setting.
+
+      If you enable this setting, Restricted Mode on YouTube is always enforced to be at least Moderate.

[Thiemo Nagel, 2016/10/05 17:38:15]

Style nit: I'd suggest to use passive voice in technical documentation (not
addressing the reader directly with "you").

[ljusten (tachyonic), 2016/10/06 10:14:45]

Done.

+
+      If you disable this setting or do not set a value, Restricted Mode on YouTube is not enforced.''',

[Thiemo Nagel, 2016/10/05 17:38:15]

I guess it would make sense to add "on the client side" or similar, since afaiu,
restricted mode can also be enforced by the server based on the user's account,
independent of the presence or lack of a header sent by Chrome.

[ljusten (tachyonic), 2016/10/06 10:14:45]

Done.

+      'arc_support': 'This policy has no effect on the Android YouTube app. If you want to enforce Safety Mode on YouTube, you should disallow installation of the Android YouTube app.',
+    },
+    {
+      'name': 'ForceYouTubeRestrict',
+      'type': 'int-enum',
+      'schema': {
+        'type': 'integer',
+        'enum': [ 0, 1, 2 ],
+      },
+      'items': [
+        {
+          'name': 'Off',
+          'value': 0,
+          'caption': '''Do not enforce Restricted Mode on YouTube''',
+        },
+        {
+          'name': 'Moderate',
+          'value': 1,
+          'caption': '''Enforce at least Moderate Restricted Mode on YouTube''',
+        },
+        {
+          'name': 'Strict',
+          'value': 2,
+          'caption': '''Enforce Strict Restricted Mode for YouTube''',
+        },
+      ],
+      'supported_on': ['chrome.*:55-', 'chrome_os:55-', 'android:55-'],
+      'features': {
+        'can_be_recommended': False,
+        'dynamic_refresh': True,
+        'per_profile': True,
+      },
+      'example_value': 0,
+      'id': 347,
+      'caption': '''Force minimum YouTube Restricted Mode''',
+      'tags': ['filtering'],
+      'desc': '''Enforces a minimum Restricted Mode on YouTube and prevents users from
+      picking a less restricted mode.
+
+      If this setting is set to Strict, Strict Restricted Mode on YouTube is always active.
 
-      If you enable this setting, Safety Mode on YouTube is always active.
+      If this setting is set to Moderate, the user may only pick Moderate Restricted Mode
+      and Strict Restricted Mode on YouTube, but cannot disable Restricted Mode.
 
-      If you disable this setting or do not set a value, Safety Mode on YouTube is not enforced.''',
+      If this setting is set to Off or no value is set, Restricted Mode on YouTube is not enforced. The user may pick any value.''',

[Thiemo Nagel, 2016/10/05 17:38:15]

I think this should come with a caveat that other policies may cause restricted
mode to be set.

Ideally, at one place in this file there should be a complete decision tree that
explains which combinations will cause which effects.  Then the individual
policies can refer to that place for full explanation.

[ljusten (tachyonic), 2016/10/06 10:14:45]

I've clarified this a bit by mentioning YouTube policies. 
Since SafetyMode is deprecated, I don't think we need to explain the full
decision tree. We're meeting the usual expectation "if the new policy is not
set, the deprecated one keeps working like before" and "the new policy overrides
the deprecated one".

       'arc_support': 'This policy has no effect on the Android YouTube app. If you want to enforce Safety Mode on YouTube, you should disallow installation of the Android YouTube app.',

[Thiemo Nagel, 2016/10/05 17:38:14]

Nit: Same as above, I'd prefer passive voice in techdoc.

[ljusten (tachyonic), 2016/10/06 10:14:45]

Done.

     },
     {