From 2b18805daa18a3bc4d9892f50e44d5cfacdad451 Mon Sep 17 00:00:00 2001 From: treib Date: Fri, 17 Apr 2015 05:32:50 -0700 Subject: 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/android/preferences/pref_service_bridge.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/android/preferences') diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc index e16dc42e..189bab0 100644 --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc @@ -344,8 +344,8 @@ static jboolean GetCrashReportManaged(JNIEnv* env, jobject obj) { prefs::kCrashReportingEnabled); } -static jboolean GetForceSafeSearch(JNIEnv* env, jobject obj) { - return GetPrefService()->GetBoolean(prefs::kForceSafeSearch); +static jboolean GetForceGoogleSafeSearch(JNIEnv* env, jobject obj) { + return GetPrefService()->GetBoolean(prefs::kForceGoogleSafeSearch); } static jint GetDefaultSupervisedUserFilteringBehavior(JNIEnv* env, -- cgit v1.1