Enterprise policy: Ignore the deprecated ForceSafeSearch if ForceGoogleSafeSearch...
commit2b18805daa18a3bc4d9892f50e44d5cfacdad451
authortreib <treib@chromium.org>
Fri, 17 Apr 2015 12:32:50 +0000 (17 05:32 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 17 Apr 2015 12:33:10 +0000 (17 12:33 +0000)
tree2e0c35f96ed15ea24d6cdda72156883ef96d3f74
parent6ab822eb229fcf3133e96680f284d899b64da10d
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}
16 files changed:
chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
chrome/browser/android/preferences/pref_service_bridge.cc
chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
chrome/browser/io_thread.cc
chrome/browser/net/chrome_network_delegate.cc
chrome/browser/net/chrome_network_delegate.h
chrome/browser/net/chrome_network_delegate_unittest.cc
chrome/browser/policy/configuration_policy_handler_list_factory.cc
chrome/browser/policy/policy_browsertest.cc
chrome/browser/profiles/profile_impl.cc
chrome/browser/profiles/profile_io_data.cc
chrome/browser/profiles/profile_io_data.h
chrome/common/pref_names.cc
chrome/common/pref_names.h
components/policy/resources/policy_templates.json