Recommit and fix of "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyM…

chrome/browser/net/chrome_network_delegate.h

Index: chrome/browser/net/chrome_network_delegate.h
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index 5baaad3d47c0dbbf1bf575f8e61d2412d051e345..dd3d54988b7bbc2687bee4970fd05cc2e683610f 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -16,6 +16,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "chrome/browser/net/safe_search_util.h"
 #include "components/data_use_measurement/content/data_use_measurement.h"
 #include "components/metrics/data_use_tracker.h"
 #include "components/prefs/pref_member.h"
@@ -78,8 +79,8 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
     url_blacklist_manager_ = url_blacklist_manager;
   }
 
-  // If |profile| is NULL or not set, events will be broadcast to all profiles,
-  // otherwise they will only be sent to the specified profile.
+  // If |profile| is nullptr or not set, events will be broadcast to all
+  // profiles, otherwise they will only be sent to the specified profile.
   // Also pass through to ChromeExtensionsNetworkDelegate::set_profile().
   void set_profile(void* profile);
 
@@ -90,7 +91,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
     profile_path_ = profile_path;
   }
 
-  // If |cookie_settings| is NULL or not set, all cookies are enabled,
+  // If |cookie_settings| is nullptr or not set, all cookies are enabled,
   // otherwise the settings are enforced on all observed network requests.
   // Not inlined because we assign a scoped_refptr, which requires us to include
   // the header file. Here we just forward-declare it.
@@ -105,9 +106,9 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
     force_google_safe_search_ = force_google_safe_search;
   }
 
-  void set_force_youtube_safety_mode(
-      BooleanPrefMember* force_youtube_safety_mode) {
-    force_youtube_safety_mode_ = force_youtube_safety_mode;
+  void set_force_youtube_restrict(
+      IntegerPrefMember* force_youtube_restrict) {
+    force_youtube_restrict_ = force_youtube_restrict;
   }
 
   void set_allowed_domains_for_apps(
@@ -125,13 +126,13 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
       bool is_data_usage_off_the_record);
 
   // Binds the pref members to |pref_service| and moves them to the IO thread.
-  // |enable_referrers| cannot be NULL, the others can.
+  // |enable_referrers| cannot be nullptr, the others can.
   // This method should be called on the UI thread.
   static void InitializePrefsOnUIThread(
       BooleanPrefMember* enable_referrers,
       BooleanPrefMember* enable_do_not_track,
       BooleanPrefMember* force_google_safe_search,
-      BooleanPrefMember* force_youtube_safety_mode,
+      IntegerPrefMember* force_youtube_restrict,
       StringPrefMember* allowed_domains_for_apps,
       PrefService* pref_service);
 
@@ -205,7 +206,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
   BooleanPrefMember* enable_referrers_;
   BooleanPrefMember* enable_do_not_track_;
   BooleanPrefMember* force_google_safe_search_;
-  BooleanPrefMember* force_youtube_safety_mode_;
+  IntegerPrefMember* force_youtube_restrict_;
   StringPrefMember* allowed_domains_for_apps_;
 
   // Weak, owned by our owner.