Revert "🤠 Disable flaky payment chrome_public_test_apk on Marshmallow."

Reason for revert:
The tests were disabled on Marshmallow because they were caused by
crbug.com/1094008. Now that the root issue has been fixed, I am
reenabling the tests.

Original CL:
https://chromium-review.googlesource.com/c/chromium/src/+/2376465

Bug: 1102320
Change-Id: I687d099b28815518348650a3a24cb19e3b511acd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380091Reviewed-by: Sahel Sharify <sahel@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Liquan (Max) Gu <maxlg@chromium.org>
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802318}

chrome/android/javatests/src/org/chromium/chrome/browser/payments/ExpandablePaymentHandlerChangePaymentMethodTest.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 
 import androidx.test.filters.MediumTest;
@@ -17,7 +16,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -102,11 +100,7 @@ public class ExpandablePaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testReject() throws Throwable {
+    public void testReject() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testReject", mRule.getDismissed());
         mRule.expectResultContains(
@@ -134,11 +128,7 @@ public class ExpandablePaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testThrow() throws Throwable {
+    public void testThrow() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testThrow", mRule.getDismissed());
         mRule.expectResultContains(
@@ -151,11 +141,7 @@ public class ExpandablePaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testThrowBasicCard() throws Throwable {
+    public void testThrowBasicCard() throws Throwable {
         mRule.clickNode("basicCardMethodName");
         installPaymentHandler();
         mRule.triggerUIAndWait("testThrow", mRule.getReadyToPay());
@@ -170,11 +156,7 @@ public class ExpandablePaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testDetails() throws Throwable {
+    public void testDetails() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testDetails", mRule.getDismissed());
         // Look for the this exact return value to ensure that the browser redacts some details
@@ -197,11 +179,7 @@ public class ExpandablePaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testDetailsBasicCard() throws Throwable {
+    public void testDetailsBasicCard() throws Throwable {
         mRule.clickNode("basicCardMethodName");
         installPaymentHandler();
         mRule.triggerUIAndWait("testDetails", mRule.getReadyToPay());

chrome/android/javatests/src/org/chromium/chrome/browser/payments/ExpandablePaymentHandlerTest.java

@@ -15,7 +15,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import android.os.Build;
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.uiautomator.UiDevice;
 
@@ -370,9 +369,6 @@ public class ExpandablePaymentHandlerTest {
             sdk_is_greater_than = Build.VERSION_CODES.LOLLIPOP_MR1,
             sdk_is_less_than = Build.VERSION_CODES.N)
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
     public void
     testNavigateBackWithSystemBackButton() throws Throwable {
         startDefaultServer();
@@ -423,11 +419,7 @@ public class ExpandablePaymentHandlerTest {
     @SmallTest
     @Feature({"Payments"})
     @ParameterAnnotations.UseMethodParameter(GoodCertParams.class)
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testSecureConnectionShowUi(int goodCertificate) throws Throwable {
+    public void testSecureConnectionShowUi(int goodCertificate) throws Throwable {
         startServer(goodCertificate);
         PaymentHandlerCoordinator paymentHandler = createPaymentHandlerAndShow(mDefaultIsIncognito);
         waitForTitleShown(paymentHandler.getWebContentsForTest());

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentHandlerChangePaymentMethodTest.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 
 import androidx.test.filters.MediumTest;
@@ -17,7 +16,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -74,11 +72,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testNoEventHandler() throws Throwable {
+    public void testNoEventHandler() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testNoHandler", mRule.getDismissed());
         mRule.expectResultContains(
@@ -91,11 +85,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testNoEventHandlerBasicCard() throws Throwable {
+    public void testNoEventHandlerBasicCard() throws Throwable {
         mRule.clickNode("basicCardMethodName");
         installPaymentHandler();
         mRule.triggerUIAndWait("testNoHandler", mRule.getReadyToPay());
@@ -110,11 +100,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testReject() throws Throwable {
+    public void testReject() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testReject", mRule.getDismissed());
         mRule.expectResultContains(
@@ -127,11 +113,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testRejectBasicCard() throws Throwable {
+    public void testRejectBasicCard() throws Throwable {
         mRule.clickNode("basicCardMethodName");
         installPaymentHandler();
         mRule.triggerUIAndWait("testReject", mRule.getReadyToPay());
@@ -146,11 +128,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testThrow() throws Throwable {
+    public void testThrow() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testThrow", mRule.getDismissed());
         mRule.expectResultContains(
@@ -178,11 +156,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testDetails() throws Throwable {
+    public void testDetails() throws Throwable {
         installPaymentHandler();
         mRule.clickNodeAndWait("testDetails", mRule.getDismissed());
         // Look for the this exact return value to ensure that the browser redacts some details
@@ -205,11 +179,7 @@ public class PaymentHandlerChangePaymentMethodTest {
      */
     @Test
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testDetailsBasicCard() throws Throwable {
+    public void testDetailsBasicCard() throws Throwable {
         mRule.clickNode("basicCardMethodName");
         installPaymentHandler();
         mRule.triggerUIAndWait("testDetails", mRule.getReadyToPay());

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentHandlerEnableDelegationsTest.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.payments;
 
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 import android.view.View;
 
@@ -20,7 +19,6 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -88,11 +86,7 @@ public class PaymentHandlerEnableDelegationsTest {
     @Test
     @Feature({"Payments"})
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testShippingDelegation() throws Throwable {
+    public void testShippingDelegation() throws Throwable {
         installPaymentHandlerWithDelegations("['shippingAddress']");
         // The pay button should be enabled when shipping address is requested and the selected
         // payment instrument can provide it.
@@ -120,11 +114,7 @@ public class PaymentHandlerEnableDelegationsTest {
     @Test
     @Feature({"Payments"})
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testShippingAndContactInfoDelegation() throws Throwable {
+    public void testShippingAndContactInfoDelegation() throws Throwable {
         installPaymentHandlerWithDelegations(
                 "['shippingAddress', 'payerName', 'payerEmail', 'payerPhone']");
         // The pay button should be enabled when shipping address and payer's contact information
@@ -155,11 +145,7 @@ public class PaymentHandlerEnableDelegationsTest {
     @Test
     @Feature({"Payments"})
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testPartialDelegationContactInfoNotSupported() throws Throwable {
+    public void testPartialDelegationContactInfoNotSupported() throws Throwable {
         installPaymentHandlerWithDelegations("['shippingAddress']");
         createPaymentRequestAndWaitFor(
                 "{requestShipping: true, requestPayerName: true, requestPayerEmail: true}",

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentMethodIdentifierTest.java

@@ -8,8 +8,6 @@ import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.DECEMB
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.FIRST_BILLING_ADDRESS;
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.NEXT_YEAR;
 
-import android.os.Build.VERSION_CODES;
-
 import androidx.test.filters.MediumTest;
 
 import org.junit.Before;
@@ -19,7 +17,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
@@ -114,11 +111,7 @@ public class PaymentRequestPaymentMethodIdentifierTest implements MainActivitySt
     @Test
     @MediumTest
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testPayWithBasicCard() throws TimeoutException {
+    public void testPayWithBasicCard() throws TimeoutException {
         mPaymentRequestTestRule.openPageAndClickNodeAndWait(
                 "checkBasicVisa", mPaymentRequestTestRule.getCanMakePaymentQueryResponded());
         mPaymentRequestTestRule.expectResultContains(new String[] {"true"});
@@ -142,11 +135,7 @@ public class PaymentRequestPaymentMethodIdentifierTest implements MainActivitySt
     @Test
     @MediumTest
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testAddMasterCard() throws TimeoutException {
+    public void testAddMasterCard() throws TimeoutException {
         mPaymentRequestTestRule.triggerUIAndWait(mPaymentRequestTestRule.getReadyToPay());
         mPaymentRequestTestRule.clickInPaymentMethodAndWait(
                 R.id.payments_section, mPaymentRequestTestRule.getReadyForInput());

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestRemoveBillingAddressTest.java

@@ -8,8 +8,6 @@ import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.DECEMB
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.FIRST_BILLING_ADDRESS;
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.NEXT_YEAR;
 
-import android.os.Build.VERSION_CODES;
-
 import androidx.test.filters.MediumTest;
 
 import org.junit.ClassRule;
@@ -18,7 +16,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
@@ -68,11 +65,7 @@ public class PaymentRequestRemoveBillingAddressTest implements MainActivityStart
     @Test
     @MediumTest
     @Feature({"Payments"})
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1102320")
-    public void
-    testPayWithCard() throws TimeoutException {
+    public void testPayWithCard() throws TimeoutException {
         mPaymentRequestTestRule.triggerUIAndWait(mPaymentRequestTestRule.getReadyForInput());
 
         // Expand the payment section.