Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/browser/net/safe_search_util.h

Index: chrome/browser/net/safe_search_util.h
diff --git a/chrome/browser/net/safe_search_util.h b/chrome/browser/net/safe_search_util.h
index 2e9a0edb7afe9f269d3fc777d9d45627fd381751..688a4273f81779cd6244f12aa5732546ff7bbbc7 100644
--- a/chrome/browser/net/safe_search_util.h
+++ b/chrome/browser/net/safe_search_util.h
@@ -14,20 +14,36 @@ class URLRequest;
 
 namespace safe_search_util {
 
+// Values for YouTube Restricted Mode.
+// VALUES MUST COINCIDE WITH ForceYouTubeRestrict POLICY.
+enum YouTubeRestrictMode {
+  YOUTUBE_RESTRICT_OFF = 0,      // Do not restrict YouTube content. YouTube
+                                 // might still restrict content based on its
+                                 // user settings.
+  YOUTUBE_RESTRICT_MODERATE = 1, // Enforce at least a moderately strict
+                                 // content filter for YouTube.
+  YOUTUBE_RESTRICT_STRICT = 2,   // Enforce a strict content filter for YouTube.
+  // Increase kYouTubeRestrictModeCount if you add new values!
+};
+const int kYouTubeRestrictModeCount = 3;  // Enum counter

[Thiemo Nagel, 2016/10/06 14:05:58]

Please make this an enum entry YOUTUBE_RESTRICT_COUNT = 3.  For better or worse,
that's the standard practice in Chrome.

[ljusten (tachyonic), 2016/10/06 16:16:58]

Done.

+
 // If |request| is a request to Google Web Search, enforces that the SafeSearch
 // query parameters are set to active. Sets |new_url| to a copy of the request
 // url in which the query part contains the new values of the parameters.
 void ForceGoogleSafeSearch(const net::URLRequest* request, GURL* new_url);
 
-// If |request| is a request to YouTube, enforces YouTube's Safety Mode by
-// setting YouTube's Safety Mode header.
-void ForceYouTubeSafetyMode(const net::URLRequest* request,
-                            net::HttpRequestHeaders* headers);
+// Does nothing if |request| is not a request to YouTube. Otherwise, if |mode|
+// is not |YOUTUBE_RESTRICT_OFF|, enforces a minimum YouTube Restrict mode
+// by setting YouTube Restrict header. Setting |YOUTUBE_RESTRICT_OFF|
+// removes a Restrict header if it exists.
+void ForceYouTubeRestrict(const net::URLRequest* request,
+                          net::HttpRequestHeaders* headers,
+                          YouTubeRestrictMode mode);
 
 int GetForceGoogleSafeSearchCountForTesting();
-int GetForceYouTubeSafetyModeCountForTesting();
+int GetForceYouTubeRestrictCountForTesting();
 void ClearForceGoogleSafeSearchCountForTesting();
-void ClearForceYouTubeSafetyModeCountForTesting();
+void ClearForceYouTubeRestrictCountForTesting();
 
 }  // namespace safe_search_util