[SB Delayed Warnings] Ignore Chrome Custom Tabs

SafeBrowsing Delayed Warnings experiment is implemented to measure how
URL display changes in the omnibox affect phishing rate. The URL display
changes hide parts of the URL in the omnibox. Since Chrome Custom Tabs
already shows only the hostname, we don't need to delay warnings that
happen in CCT.

Bug: 1113383
Change-Id: Id71f185812dbd4c8106d7c6bbc578505d0bdf2ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372777
Commit-Queue: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Ella Ge <eirage@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801197}

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

@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
-import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
 import org.chromium.components.embedder_support.util.Origin;
@@ -61,6 +60,7 @@ import java.util.concurrent.TimeoutException;
 
 /** Tests for detached resource requests. */
 @RunWith(ChromeJUnit4ClassRunner.class)
+@EnableFeatures(ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS)
 public class DetachedResourceRequestTest {
     @Rule
     public CustomTabActivityTestRule mCustomTabActivityTestRule = new CustomTabActivityTestRule();
@@ -315,11 +315,9 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @DisableFeatures({ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY,
-            ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
+    @DisableFeatures(ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY)
 
-    public void
-    testSafeBrowsingMainResource() throws Exception {
+    public void testSafeBrowsingMainResource() throws Exception {
         testSafeBrowsingMainResource(true /* afterNative */, false /* splitCacheEnabled */);
     }
 
@@ -330,7 +328,6 @@ 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 */);
     }
@@ -341,7 +338,6 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @DisableFeatures({ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
     public void testSafeBrowsingSubresource() throws Exception {
         testSafeBrowsingSubresource(true);
     }
@@ -352,10 +348,8 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @DisableFeatures({ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY,
-            ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
-    public void
-    testSafeBrowsingMainResourceBeforeNative() throws Exception {
+    @DisableFeatures(ChromeFeatureList.SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY)
+    public void testSafeBrowsingMainResourceBeforeNative() throws Exception {
         testSafeBrowsingMainResource(false /* afterNative */, false /* splitCacheEnabled */);
     }
 
@@ -365,7 +359,6 @@ public class DetachedResourceRequestTest {
      */
     @Test
     @SmallTest
-    @Features.DisableFeatures({ChromeFeatureList.SAFE_BROWSING_DELAYED_WARNINGS})
     public void testSafeBrowsingSubresourceBeforeNative() throws Exception {
         testSafeBrowsingSubresource(false);
     }

chrome/browser/safe_browsing/url_checker_delegate_impl.cc

@@ -6,6 +6,8 @@
 
 #include "base/bind.h"
 #include "base/feature_list.h"
+#include "build/build_config.h"
+#include "chrome/browser/android/customtabs/client_data_header_web_contents_observer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/chrome_prerender_contents_delegate.h"
 #include "chrome/browser/profiles/profile.h"
@@ -26,6 +28,10 @@
 #include "content/public/browser/web_contents.h"
 #include "services/network/public/cpp/features.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/tab_android.h"
+#endif
+
 namespace safe_browsing {
 namespace {
 
@@ -56,6 +62,14 @@ void CreateSafeBrowsingUserInteractionObserver(
     SafeBrowsingUIManager::StartDisplayingBlockingPage(ui_manager, resource);
     return;
   }
+#if defined(OS_ANDROID)
+  // Don't delay the interstitial for Chrome Custom Tabs.
+  auto* tab_android = TabAndroid::FromWebContents(web_contents);
+  if (tab_android && tab_android->IsCustomTab()) {
+    SafeBrowsingUIManager::StartDisplayingBlockingPage(ui_manager, resource);
+    return;
+  }
+#endif
   SafeBrowsingUserInteractionObserver::CreateForWebContents(
       web_contents, resource, is_main_frame, ui_manager);
 }