commit 2b18805daa18a3bc4d9892f50e44d5cfacdad451
author treib <treib@chromium.org> Fri Apr 17 12:32:50 2015
committer Commit bot <commit-bot@chromium.org> Fri Apr 17 12:33:10 2015
tree 2e0c35f96ed15ea24d6cdda72156883ef96d3f74
parent 6ab822eb229fcf3133e96680f284d899b64da10d

Enterprise policy: Ignore the deprecated ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

While we're here, remove the deprecated prefs::kForceSafeSearch and instead map the old policy to the new prefs

TBR=cbentzel@chromium.org for trivial io_thread.cc change

BUG=476908

Review URL: https://codereview.chromium.org/1056003003

Cr-Commit-Position: refs/heads/master@{#325620}

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 40d2687..27ff3ef 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -285,7 +285,6 @@
     : profile_(NULL),
       enable_referrers_(enable_referrers),
       enable_do_not_track_(NULL),
-      force_safe_search_(NULL),
       force_google_safe_search_(NULL),
       force_youtube_safety_mode_(NULL),
 #if defined(ENABLE_CONFIGURATION_POLICY)
@@ -334,7 +333,6 @@
 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
     BooleanPrefMember* enable_referrers,
     BooleanPrefMember* enable_do_not_track,
-    BooleanPrefMember* force_safe_search,
     BooleanPrefMember* force_google_safe_search,
     BooleanPrefMember* force_youtube_safety_mode,
     PrefService* pref_service) {
@@ -347,11 +345,6 @@
     enable_do_not_track->MoveToThread(
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
   }
-  if (force_safe_search) {
-    force_safe_search->Init(prefs::kForceSafeSearch, pref_service);
-    force_safe_search->MoveToThread(
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
-  }
   if (force_google_safe_search) {
     force_google_safe_search->Init(prefs::kForceGoogleSafeSearch, pref_service);
     force_google_safe_search->MoveToThread(
@@ -398,7 +391,6 @@
     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());
 
   net::CompletionCallback wrapped_callback = callback;
@@ -425,10 +417,7 @@
     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)
+  if (force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue())
     safe_search_util::ForceYouTubeSafetyMode(request, headers);
 
   return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);