Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

chrome/browser/net/chrome_network_delegate.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/browser/net/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 379 matching lines @@
 #endif
 
   extensions_delegate_->ForwardStartRequestStatus(request);
 
   if (!enable_referrers_->GetValue())
     request->SetReferrer(std::string());
   if (enable_do_not_track_ && enable_do_not_track_->GetValue())
     request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
 
   bool force_safe_search =
-      (force_safe_search_ && force_safe_search_->GetValue()) ||
       (force_google_safe_search_ && force_google_safe_search_->GetValue());
+  if (!force_safe_search &&

[Marc Treib, 2015/04/14 13:27:15]

I guess this part isn't *strictly* required for the migration case, but
consistency and all that... :)

+      !(force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue())) {
+    // In case neither ForceGoogleSafeSearch nor ForceYoutubeSafetyMode are
+    // enabled, fall back to the deprecated ForceSafeSearch. crbug.com/476908
+    force_safe_search = (force_safe_search_ && force_safe_search_->GetValue());
+  }
 
   net::CompletionCallback wrapped_callback = callback;
   if (force_safe_search) {
     wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
                                   callback,
                                   base::Unretained(request),
                                   base::Unretained(new_url));
   }
 
   int rv = extensions_delegate_->OnBeforeURLRequest(
       request, wrapped_callback, new_url);
 
   if (force_safe_search && rv == net::OK && new_url->is_empty())
     safe_search_util::ForceGoogleSafeSearch(request, new_url);
 
   if (connect_interceptor_)
     connect_interceptor_->WitnessURLRequest(request);
 
   return rv;
 }
 
 int ChromeNetworkDelegate::OnBeforeSendHeaders(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
   bool force_safety_mode =
-      (force_safe_search_ && force_safe_search_->GetValue()) ||
       (force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue());
+  if (!force_safety_mode &&
+      !(force_google_safe_search_ && force_google_safe_search_->GetValue())) {
+    // In case neither ForceGoogleSafeSearch nor ForceYoutubeSafetyMode are
+    // enabled, fall back to the deprecated ForceSafeSearch. crbug.com/476908
+    force_safety_mode = (force_safe_search_ && force_safe_search_->GetValue());
+  }
   if (force_safety_mode)
     safe_search_util::ForceYouTubeSafetyMode(request, headers);
 
   return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);
 }
 
 void ChromeNetworkDelegate::OnSendHeaders(
     net::URLRequest* request,
     const net::HttpRequestHeaders& headers) {
   extensions_delegate_->OnSendHeaders(request, headers);
@@ skipping 247 matching lines @@
   return experimental_web_platform_features_enabled_;
 }
 
 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
     const net::URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   ReportInvalidReferrerSend(target_url, referrer_url);
   return true;
 }