Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/browser/net/safe_search_util.cc

Index: chrome/browser/net/safe_search_util.cc
diff --git a/chrome/browser/net/safe_search_util.cc b/chrome/browser/net/safe_search_util.cc
index 17bda6605a805c9583e7d8aeaf551940cfb5e296..7988170eec793a372b117d43e8f08e9d3a93ef52 100644
--- a/chrome/browser/net/safe_search_util.cc
+++ b/chrome/browser/net/safe_search_util.cc
@@ -25,10 +25,11 @@
 namespace {
 
 int g_force_google_safe_search_count_for_test = 0;
-int g_force_youtube_safety_mode_count_for_test = 0;
+int g_force_youtube_restrict_count_for_test = 0;
 
-const char kYouTubeSafetyModeHeaderName[] = "YouTube-Safety-Mode";
-const char kYouTubeSafetyModeHeaderValue[] = "Active";
+const char kYouTubeRestrictHeaderName[] = "YouTube-Restrict";
+const char kYouTubeRestrictHeaderValueModerate[] = "Moderate";
+const char kYouTubeRestrictHeaderValueStrict[] = "Strict";
 
 // Returns whether a URL parameter, |first_parameter| (e.g. foo=bar), has the
 // same key as the the |second_parameter| (e.g. foo=baz). Both parameters
@@ -88,11 +89,14 @@ void ForceGoogleSafeSearch(const net::URLRequest* request, GURL* new_url) {
   *new_url = request->url().ReplaceComponents(replacements);
 }
 
-// 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) {
-  ++g_force_youtube_safety_mode_count_for_test;
+// Does nothing if |request| is not a request to YouTube. Otherwise, if |mode|

[Thiemo Nagel, 2016/10/05 17:38:14]

Please don't duplicate comments (otherwise they're certain to get out of sync
sooner or later).  The .h file is the right place for the method description,
thus please remove it here.

[ljusten (tachyonic), 2016/10/06 10:14:45]

Done.

+// is not |YouTubeRestrictMode::kOff|, enforces a minimum YouTube Restrict mode
+// by setting YouTube Restrict header. Setting |YouTubeRestrictMode::kOff|
+// removes a Restrict header if it exists.
+void ForceYouTubeRestrict(const net::URLRequest* request,
+                          net::HttpRequestHeaders* headers,
+                          YouTubeRestrictMode mode) {
+  ++g_force_youtube_restrict_count_for_test;
 
   if (!google_util::IsYoutubeDomainUrl(
           request->url(),
@@ -100,24 +104,41 @@ void ForceYouTubeSafetyMode(const net::URLRequest* request,
           google_util::DISALLOW_NON_STANDARD_PORTS))
     return;
 
-  headers->SetHeader(kYouTubeSafetyModeHeaderName,
-                     kYouTubeSafetyModeHeaderValue);
+  switch (mode) {
+    case YouTubeRestrictMode::kOff:
+      // 'Off' wipes an existing header if it exists
+      headers->RemoveHeader(kYouTubeRestrictHeaderName);
+      return;
+
+    case YouTubeRestrictMode::kModerate:
+      headers->SetHeader(kYouTubeRestrictHeaderName,
+                         kYouTubeRestrictHeaderValueModerate);
+      break;
+
+    case YouTubeRestrictMode::kStrict:
+      headers->SetHeader(kYouTubeRestrictHeaderName,
+                         kYouTubeRestrictHeaderValueStrict);
+      break;
+
+      // No default! That way, adding a new enum value results in a compile

[Thiemo Nagel, 2016/10/05 17:38:14]

This is pretty much a standard practice.  No need to add a comment about it.

[ljusten (tachyonic), 2016/10/06 10:14:45]

Done.

+      // error.
+  }
 }
 
 int GetForceGoogleSafeSearchCountForTesting() {
   return g_force_google_safe_search_count_for_test;
 }
 
-int GetForceYouTubeSafetyModeCountForTesting() {
-  return g_force_youtube_safety_mode_count_for_test;
+int GetForceYouTubeRestrictCountForTesting() {
+  return g_force_youtube_restrict_count_for_test;
 }
 
 void ClearForceGoogleSafeSearchCountForTesting() {
   g_force_google_safe_search_count_for_test = 0;
 }
 
-void ClearForceYouTubeSafetyModeCountForTesting() {
-  g_force_youtube_safety_mode_count_for_test = 0;
+void ClearForceYouTubeRestrictCountForTesting() {
+  g_force_youtube_restrict_count_for_test = 0;
 }
 
 }  // namespace safe_search_util