Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d020d174614a8569e11cf1b8e5d9263f9bbc0a51..11f31ca1af5d1fbf9817a2ca415ffe66fbae8ace 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -937,7 +937,15 @@ const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled";
 const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch";
 
 // Boolean controlling whether Safety Mode is mandatory on YouTube.
-const char kForceYouTubeSafetyMode[] = "settings.force_youtube_safety_mode";
+// DEPRECATED: This on/off setting has been replaced by the more fine-grained

[Thiemo Nagel, 2016/08/12 12:12:20]

Same here: Just drop the constant.

[ljusten (tachyonic), 2016/08/16 09:24:54]

Done.

+//   ForceYouTubeRestrict. If the ForceYouTubeRestrict is set, we are still
+//   looking for the ForceYouTubeSafetyMode policy. If it is set, we set the
+//   ForceYouTubeRestrict setting to MODERATE.
+// const char kForceYouTubeSafetyMode[] = "settings.force_youtube_safety_mode";
+
+// Integer controlling whether Restrict Mode (moderate/strict) is mandatory on
+// YouTube.
+const char kForceYouTubeRestrict[] = "settings.force_youtube_restrict";
 
 // Boolean controlling whether history is recorded via Session Sync
 // (for supervised users).