Enables Safe Browsing flag on Android by default

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -197,6 +197,7 @@
 import org.chromium.components.safe_browsing.SafeBrowsingApiBridge;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.user_prefs.UserPrefs;
+import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.mojo.bindings.ConnectionErrorHandler;
 import org.chromium.mojo.system.MojoException;
@@ -270,6 +271,7 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
     private boolean isProcessingPendingDappsTxRequest;
     private int mLastTabId;
     private boolean mNativeInitialized;
+    private boolean mSafeBrowsingFlagEnabled;
     private NewTabPageManager mNewTabPageManager;
     private NotificationPermissionController mNotificationPermissionController;
     private BraveNewsController mBraveNewsController;
@@ -307,15 +309,13 @@ public void onResumeWithNative() {
             }
             updateWalletBadgeVisibility();
         }
-        boolean safeBrowsingFlagEnabled =
+
+        // We can store a state of that flag as a browser has to be restarted
+        // when the flag state is changed in any case
+        mSafeBrowsingFlagEnabled =
                 ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_ANDROID_SAFE_BROWSING);
-        boolean safeBrowsingPrefEnabled =
-                SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING;
-        if (safeBrowsingFlagEnabled && safeBrowsingPrefEnabled) {
-            executeInitSafeBrowsing(0);
-        } else if (!safeBrowsingFlagEnabled && safeBrowsingPrefEnabled) {
-            SafeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
-        }
+
+        executeInitSafeBrowsing(0);
     }
 
     @Override
@@ -830,6 +830,11 @@ public void turnSafeBrowsingOff() {
         SafeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
     }
 
+    @Override
+    public boolean isSafeBrowsingEnabled() {
+        return mSafeBrowsingFlagEnabled;
+    }
+
     @Override
     public Activity getActivity() {
         return this;
@@ -1995,8 +2000,13 @@ public void addOrEditBookmark(final Tab tabToBookmark) {
     // BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS,
     // as upstream does, to keep the GmsCore process alive.
     private void executeInitSafeBrowsing(long delay) {
-        PostTask.postDelayedTask(TaskTraits.USER_VISIBLE_MAY_BLOCK, () -> {
-            BraveSafeBrowsingApiHandler.getInstance().initSafeBrowsing();
+        // SafeBrowsingBridge.getSafeBrowsingState() has to be executed on a main thread
+        PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, () -> {
+            if (SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING) {
+                // initSafeBrowsing could be executed on a background thread
+                PostTask.postTask(TaskTraits.USER_VISIBLE_MAY_BLOCK,
+                        () -> { BraveSafeBrowsingApiHandler.getInstance().initSafeBrowsing(); });
+            }
             executeInitSafeBrowsing(BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS);
         }, delay);
     }

android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java

@@ -72,8 +72,7 @@ public void testParentItems() {
         checkPreferenceExists(PREF_CLEAR_BROWSING_DATA);
         checkPreferenceExists(PREF_DO_NOT_TRACK);
         checkPreferenceExists(PREF_HTTPS_FIRST_MODE);
-        // TODO : Need to add back the test once we have fix ready for safe browsing
-        // checkPreferenceExists(PREF_SAFE_BROWSING);
+        checkPreferenceExists(PREF_SAFE_BROWSING);
         checkPreferenceExists(PREF_SECURE_DNS);
         checkPreferenceExists(PREF_INCOGNITO_LOCK);
         checkPreferenceExists(PREF_PHONE_AS_A_SECURITY_KEY);

browser/android/safe_browsing/features.cc

@@ -12,7 +12,7 @@ namespace features {
 
 BASE_FEATURE(kBraveAndroidSafeBrowsing,
              "BraveAndroidSafeBrowsing",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 
 }  // namespace features
 }  // namespace safe_browsing

components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/BraveSafeBrowsingApiHandler.java

@@ -31,6 +31,9 @@ public class BraveSafeBrowsingApiHandler implements SafeBrowsingApiHandler {
 
     public interface BraveSafeBrowsingApiHandlerDelegate {
         default void turnSafeBrowsingOff() {}
+        default boolean isSafeBrowsingEnabled() {
+            return true;
+        }
         Activity getActivity();
     }
 
@@ -72,7 +75,10 @@ public boolean init(Observer observer) {
 
     @Override
     public void startUriLookup(final long callbackId, String uri, int[] threatsOfInterest) {
-        if (mBraveSafeBrowsingApiHandlerDelegate == null) {
+        if (mBraveSafeBrowsingApiHandlerDelegate == null
+                || !mBraveSafeBrowsingApiHandlerDelegate.isSafeBrowsingEnabled()) {
+            mObserver.onUrlCheckDone(
+                    callbackId, SafeBrowsingResult.TIMEOUT, "{}", DEFAULT_CHECK_DELTA);
             return;
         }
         mTriesCount++;