Disabling tests in ExpandablePaymentHandlerTest

The following are disabled on Marshmallow:
* testNavigateBackWithSystemBackButton
* testSecureConnectionShowUi__CERT_OK_BY_INTERMEDIATE
* testSecureConnectionShowUi__CERT_OK

TBR=maxlg@chromium.org

Bug: 1101030
Change-Id: I323bc3a5a2a606d55c8a1888125700bc41e79122
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274329Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: Liquan (Max) Gu <maxlg@chromium.org>
Commit-Queue: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784554}

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

@@ -14,6 +14,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.uiautomator.UiDevice;
 
@@ -31,6 +32,7 @@ import org.chromium.base.test.params.ParameterProvider;
 import org.chromium.base.test.params.ParameterSet;
 import org.chromium.base.test.params.ParameterizedRunner;
 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.ChromeActivity;
@@ -47,6 +49,7 @@ import org.chromium.net.test.ServerCertificate;
 import org.chromium.ui.test.util.DisableAnimationsTestRule;
 import org.chromium.url.GURL;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -109,15 +112,19 @@ public class ExpandablePaymentHandlerTest {
     public static class GoodCertParams implements ParameterProvider {
         @Override
         public List<ParameterSet> getParameters() {
-            return Arrays.asList(
-                    new ParameterSet().value(ServerCertificate.CERT_OK).name("CERT_OK"),
-                    new ParameterSet()
-                            .value(ServerCertificate.CERT_COMMON_NAME_IS_DOMAIN)
-                            .name("CERT_COMMON_NAME_IS_DOMAIN"),
-                    new ParameterSet()
-                            .value(ServerCertificate.CERT_OK_BY_INTERMEDIATE)
-                            .name("CERT_OK_BY_INTERMEDIATE"),
-                    new ParameterSet().value(ServerCertificate.CERT_AUTO).name("CERT_AUTO"));
+            List<ParameterSet> parameters = new ArrayList<>();
+            parameters.add(new ParameterSet()
+                                   .value(ServerCertificate.CERT_COMMON_NAME_IS_DOMAIN)
+                                   .name("CERT_COMMON_NAME_IS_DOMAIN"));
+            parameters.add(new ParameterSet().value(ServerCertificate.CERT_AUTO).name("CERT_AUTO"));
+            // Disabling 2 parameterized tests on M per https://crbug.com/1101030
+            if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M) {
+                parameters.add(new ParameterSet().value(ServerCertificate.CERT_OK).name("CERT_OK"));
+                parameters.add(new ParameterSet()
+                                       .value(ServerCertificate.CERT_OK_BY_INTERMEDIATE)
+                                       .name("CERT_OK_BY_INTERMEDIATE"));
+            }
+            return parameters;
         }
     }
 
@@ -358,8 +365,12 @@ public class ExpandablePaymentHandlerTest {
 
     @Test
     @SmallTest
+    @DisableIf.Build(message = "https://crbug.com/1101030",
+            sdk_is_greater_than = Build.VERSION_CODES.LOLLIPOP_MR1,
+            sdk_is_less_than = Build.VERSION_CODES.N)
     @Feature({"Payments"})
-    public void testNavigateBackWithSystemBackButton() throws Throwable {
+    public void
+    testNavigateBackWithSystemBackButton() throws Throwable {
         startDefaultServer();
 
         PaymentHandlerCoordinator paymentHandler = createPaymentHandlerAndShow(mDefaultIsIncognito);