[Autofill Assistant] Directly select T&C links when clicked.

Change-Id: Ie5a2015ec45f2ba19055776b70e91fe7a47b1227
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728884
Auto-Submit: Jordan Demeulenaere <jdemeulenaere@chromium.org>
Reviewed-by: Clemens Arbesser <arbesser@google.com>
Commit-Queue: Clemens Arbesser <arbesser@google.com>
Cr-Commit-Position: refs/heads/master@{#682706}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestTermsSection.java

@@ -47,6 +47,7 @@ public class AssistantPaymentRequestTermsSection {
     @Nullable
     private final TextView mTermsRequiresReview;
     private final TextView mThirdPartyPrivacyNotice;
+    @Nullable
     private Delegate mDelegate;
 
     private final SpanInfo mBoldSpanInfo =
@@ -143,10 +144,9 @@ public class AssistantPaymentRequestTermsSection {
     }
 
     private void onTermsAndConditionsLinkClicked(int link) {
-        // Ignore first click if the option is not selected yet.
-        if (!mTermsList.isChecked(mTermsAgree) || mDelegate == null) return;
-
-        mDelegate.onLinkClicked(link);
+        if (mDelegate != null) {
+            mDelegate.onLinkClicked(link);
+        }
     }
 
     public void setTermsStatus(@AssistantTermsAndConditionsState int status) {

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequestUiTest.java

@@ -590,14 +590,7 @@ public class AutofillAssistantPaymentRequestUiTest {
                                 acceptTermsText2));
         acceptMatcher = allOf(withText(acceptTermsText), isDisplayed());
 
-        assertThat(delegate.mLastLinkClicked, nullValue());
-
-        // First click marks the terms as accepted and ignores the link.
-        onView(acceptMatcher).perform(click());
-        assertThat(delegate.mTermsStatus, is(AssistantTermsAndConditionsState.ACCEPTED));
-        assertThat(delegate.mLastLinkClicked, nullValue());
-
-        // Second click will trigger the link.
+        // Clicking the text will trigger the link.
         onView(acceptMatcher).perform(click());
         assertThat(delegate.mLastLinkClicked, is(42));
     }