Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/browser/net/chrome_network_delegate.cc

Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index fab1bca45883faefe4f971e2f78892b1b6eb9763..a90257a68ad78723f0b7f70d219822a3d0af925d 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -32,7 +32,6 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
 #include "chrome/browser/net/request_source_bandwidth_histograms.h"
-#include "chrome/browser/net/safe_search_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager_interface.h"
 #include "chrome/common/chrome_constants.h"
@@ -149,7 +148,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
       enable_referrers_(enable_referrers),
       enable_do_not_track_(NULL),
       force_google_safe_search_(NULL),
-      force_youtube_safety_mode_(NULL),
+      force_youtube_restrict_(NULL),

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

Could you maybe replace NULL by nullptr while you're at it?

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

Done.

       allowed_domains_for_apps_(nullptr),
       url_blacklist_manager_(NULL),
       domain_reliability_monitor_(NULL),
@@ -193,7 +192,7 @@ void ChromeNetworkDelegate::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) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -210,10 +209,9 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread(
     force_google_safe_search->MoveToThread(
         BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
   }
-  if (force_youtube_safety_mode) {
-    force_youtube_safety_mode->Init(prefs::kForceYouTubeSafetyMode,
-                                    pref_service);
-    force_youtube_safety_mode->MoveToThread(
+  if (force_youtube_restrict) {
+    force_youtube_restrict->Init(prefs::kForceYouTubeRestrict, pref_service);
+    force_youtube_restrict->MoveToThread(
         BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
   }
   if (allowed_domains_for_apps) {
@@ -314,8 +312,11 @@ int ChromeNetworkDelegate::OnBeforeStartTransaction(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
-  if (force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue())
-    safe_search_util::ForceYouTubeSafetyMode(request, headers);
+  if (force_youtube_restrict_ &&
+      force_youtube_restrict_->GetValue() != safe_search_util::YTRM_OFF)
+    safe_search_util::ForceYouTubeRestrict(
+        request, headers, (safe_search_util::YouTubeRestrictMode)

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

Please use static_cast instead of c-style cast.  Also it would seem prudent to
add DCHECK()s to protect against out of range values.

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

Done.

+                              force_youtube_restrict_->GetValue());
 
   return extensions_delegate_->OnBeforeStartTransaction(request, callback,
                                                         headers);