Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
index 9656e5da0d6cc8d38ac532403d679b7e7af25f7e..4374e03bfe2d86b75fd2afa55e956ada0a050f1d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
@@ -841,10 +841,10 @@ public final class PrefServiceBridge {
     }
 
     /**
-     * @return whether ForceSafeSearch is set
+     * @return whether ForceGoogleSafeSearch is set
      */
-    public boolean isForceSafeSearch() {
-        return nativeGetForceSafeSearch();
+    public boolean isForceGoogleSafeSearch() {
+        return nativeGetForceGoogleSafeSearch();
     }
 
     /**
@@ -913,7 +913,7 @@ public final class PrefServiceBridge {
     private native boolean nativeGetIncognitoModeManaged();
     private native boolean nativeGetPrintingEnabled();
     private native boolean nativeGetPrintingManaged();
-    private native boolean nativeGetForceSafeSearch();
+    private native boolean nativeGetForceGoogleSafeSearch();
     private native void nativeSetTranslateEnabled(boolean enabled);
     private native void nativeResetTranslateDefaults();
     private native void nativeMigrateJavascriptPreference();