Fix three tests in Android InterceptNavigationDelegateTests.

These tests rely on assumptions on Chrome's old user gesture model.
This CL fixes the assumptions for the new model (UAv2).

Bug: 908531
Change-Id: I3d290489075f81f5c8fd414c050d1beabab48488
Reviewed-on: https://chromium-review.googlesource.com/c/1351570Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Mustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611100}

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

@@ -284,6 +284,7 @@ public abstract class ChromeFeatureList {
     public static final String VIDEO_PERSISTENCE = "VideoPersistence";
     public static final String UNIFIED_CONSENT = "UnifiedConsent";
     public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
+    public static final String USER_ACTIVATION_V2 = "UserActivationV2";
     public static final String WEB_AUTH = "WebAuthentication";
     public static final String WEB_PAYMENTS = "WebPayments";
     public static final String WEB_PAYMENTS_METHOD_SECTION_ORDER_V2 =

chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java

@@ -19,6 +19,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
@@ -146,6 +147,7 @@ public class InterceptNavigationDelegateTest {
         DOMUtils.clickNode(mActivity.getActivityTab().getWebContents(), "first");
         waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
         Assert.assertTrue(mNavParamHistory.get(1).hasUserGesture);
+        // TODO(mustaq): Not clear why cary-over is different here vs the next test.
         Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
     }
 
@@ -157,9 +159,16 @@ public class InterceptNavigationDelegateTest {
 
         DOMUtils.clickNode(mActivity.getActivityTab().getWebContents(), "first");
         waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+
+        // TODO(mustaq): Cleanup after UAv2 ships, crbug.com/908531.
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.USER_ACTIVATION_V2)) {
+            Assert.assertTrue(mNavParamHistory.get(1).hasUserGesture);
+            Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+        } else {
             Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
             Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
         }
+    }
 
     @Test
     @SmallTest
@@ -171,9 +180,16 @@ public class InterceptNavigationDelegateTest {
 
         DOMUtils.clickNode(mActivity.getActivityTab().getWebContents(), "first");
         waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+
+        // TODO(mustaq): Cleanup after UAv2 ships, crbug.com/908531.
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.USER_ACTIVATION_V2)) {
+            Assert.assertTrue(mNavParamHistory.get(1).hasUserGesture);
+            Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+        } else {
             Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
             Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
         }
+    }
 
     @Test
     @SmallTest
@@ -197,9 +213,16 @@ public class InterceptNavigationDelegateTest {
 
         DOMUtils.clickNode(mActivity.getActivityTab().getWebContents(), "first");
         waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+
+        // TODO(mustaq): Cleanup after UAv2 ships, crbug.com/908531.
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.USER_ACTIVATION_V2)) {
+            Assert.assertTrue(mNavParamHistory.get(1).hasUserGesture);
+            Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+        } else {
             Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
             Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
         }
+    }
 
     @Test
     @MediumTest

chrome/browser/android/chrome_feature_list.cc

@@ -70,6 +70,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &features::kShowTrustedPublisherURL,
     &features::kSoundContentSetting,
     &features::kSSLCommittedInterstitials,
+    &features::kUserActivationV2,
     &features::kWebAuth,
     &features::kWebPayments,
     &feed::kInterestFeedContentSuggestions,