Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
@@ skipping 919 matching lines @@
 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled";
 
 // Boolean controlling whether deleting browsing and download history is
 // permitted.
 const char kAllowDeletingBrowserHistory[] = "history.deleting_enabled";
 
 // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
 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).
 const char kForceSessionSync[] = "settings.history_recorded";
 
 // Comma separated list of domain names (e.g. "google.com,school.edu").
 // When this pref is set, the user will be able to access Google Apps
 // only using an account that belongs to one of the domains from this pref.
 const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
 
@@ skipping 1308 matching lines @@
 #endif
 
 // The base64-encoded representation of the public key to use to validate origin
 // trial token signatures.
 const char kOriginTrialPublicKey[] = "origin_trials.public_key";
 
 // A list of origin trial features to disable by policy.
 const char kOriginTrialDisabledFeatures[] = "origin_trials.disabled_features";
 
 }  // namespace prefs