Update field trial config for SafeBrowsing delayed warnings

This CL enables SafeBrowsingDelayedWarnings feature in tests by default.
It also disables the feature on a few tests on Android. The reason for
this is that the feature has good test coverage on desktop, and writing
new tests for Android will be a significant time investment.

Bug: 1077426
Change-Id: Ia5b04dc74893d513a13a72bc92ad1f1537b6691e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2327550Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Mustafa Emre Acer <meacer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795071}

chrome/android/javatests/src/org/chromium/chrome/browser/SafeBrowsingTest.java

@@ -16,10 +16,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.safe_browsing.SafeBrowsingApiBridge;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
@@ -34,6 +36,7 @@ import org.chromium.ui.base.PageTransition;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+@Features.DisableFeatures({ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
 public final class SafeBrowsingTest {
     @Rule
     public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/DetachedResourceRequestTest.java

@@ -318,8 +318,11 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @DisableFeatures(ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY)
-    public void testSafeBrowsingMainResource() throws Exception {
+    @DisableFeatures({ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY,
+            ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
+
+    public void
+    testSafeBrowsingMainResource() throws Exception {
         testSafeBrowsingMainResource(true /* afterNative */, false /* splitCacheEnabled */);
     }
 
@@ -330,6 +333,7 @@ public class DetachedResourceRequestTest {
     @Test
     @SmallTest
     @EnableFeatures(ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY)
+    @DisableFeatures(ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS)
     public void testSafeBrowsingMainResourceWithSplitCache() throws Exception {
         testSafeBrowsingMainResource(true /* afterNative */, true /* splitCacheEnabled */);
     }
@@ -340,6 +344,7 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
+    @DisableFeatures({ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
     public void testSafeBrowsingSubresource() throws Exception {
         testSafeBrowsingSubresource(true);
     }
@@ -350,8 +355,10 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @DisableFeatures(ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY)
-    public void testSafeBrowsingMainResourceBeforeNative() throws Exception {
+    @DisableFeatures({ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY,
+            ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
+    public void
+    testSafeBrowsingMainResourceBeforeNative() throws Exception {
         testSafeBrowsingMainResource(false /* afterNative */, false /* splitCacheEnabled */);
     }
 
@@ -361,6 +368,7 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
+    @Features.DisableFeatures({ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
     public void testSafeBrowsingSubresourceBeforeNative() throws Exception {
         testSafeBrowsingSubresource(false);
     }

chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -384,6 +384,7 @@ public abstract class ChromeFeatureList {
     public static final String REPORT_FEED_USER_ACTIONS = "ReportFeedUserActions";
     public static final String REVAMPED_CONTEXT_MENU = "RevampedContextMenu";
     public static final String SAFETY_CHECK_ANDROID = "SafetyCheckAndroid";
+    public static final String SAFE_BROWSING_DELAYED_WARNINGS = "SafeBrowsingDelayedWarnings";
     public static final String SAFE_BROWSING_ENHANCED_PROTECTION_ENABLED =
             "SafeBrowsingEnhancedProtection";
     public static final String SAFE_BROWSING_SECURITY_SECTION_UI =

testing/variations/fieldtrial_testing_config.json

@@ -6141,6 +6141,28 @@
             ]
         }
     ],
+    "SafeBrowsingDelayedWarnings": [
+        {
+            "platforms": [
+                "android",
+                "chromeos",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "params": {
+                        "mouse": "true"
+                    },
+                    "enable_features": [
+                        "SafeBrowsingDelayedWarnings"
+                    ]
+                }
+            ]
+        }
+    ],
     "SafeBrowsingPasswordProtectionForSavedPasswords": [
         {
             "platforms": [