[Android] Disable most translate intent tests.

These tests were previously failing only on Marshmallow, but are now
failing on Lollipop, and Pie as well.

Bug: 1127786, 1135682
Change-Id: Ib6c49f8ffa6997568fa74171b293e1bcfc41b7b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453497Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Tommy Nyquist <nyquist@chromium.org>
Auto-Submit: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814374}

chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateIntentTest.java

@@ -8,7 +8,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Build.VERSION_CODES;
 
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
@@ -25,7 +24,7 @@ import org.junit.runner.RunWith;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -136,9 +135,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.DisableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentDisabled() throws TimeoutException {
@@ -156,9 +153,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentOnTranslatePage() throws TimeoutException {
@@ -176,9 +171,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentOnNonTranslatePage() throws TimeoutException {
@@ -198,9 +191,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentWithTargetLanguage() throws TimeoutException, ExecutionException {
@@ -229,9 +220,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentWithUnsupportedTargetLanguage() throws TimeoutException {
@@ -249,9 +238,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentOnIncognito() throws TimeoutException {
@@ -273,9 +260,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentWithUrlMismatch() throws TimeoutException {
@@ -293,9 +278,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentWithoutExpectedUrl() throws TimeoutException {
@@ -313,9 +296,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentVerifyComponent() throws TimeoutException {
@@ -339,9 +320,7 @@ public class TranslateIntentTest {
 
     @Test
     @MediumTest
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Consistently failing on Marshmallow https://crbug.com/1127786")
+    @DisabledTest(message = "https://crbug.com/1127786 and https://crbug.com/1135682")
     @Features.EnableFeatures({ChromeFeatureList.TRANSLATE_INTENT})
     public void
     testTranslateIntentIncorrectComponent() throws TimeoutException {