[Android] Remove @DisableIfs with condition SDK < KitKat

Test have not been run on KitKat for a while. Change-Id: Ia1b86b55b13d17b2bbb3b580931d21f042ccf290 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4003665 Reviewed-by: Tommy Nyquist <nyquist@chromium.org> Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Cr-Commit-Position: refs/heads/main@{#1067328}
chromium · Nov 4, 2022 · 4d14970 · 4d14970
1 parent 8fdfb67
commit 4d14970
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 22 deletions.
diff --git a/...s/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFormActionTest.java b/...s/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFormActionTest.java
@@ -56,7 +56,6 @@
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.chrome.browser.autofill_assistant.proto.ActionProto;
 import org.chromium.chrome.browser.autofill_assistant.proto.ChipProto;
 import org.chromium.chrome.browser.autofill_assistant.proto.ChipType;
@@ -108,7 +107,6 @@ public class AutofillAssistantFormActionTest {
      */
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testFormAction() {
         ArrayList<ActionProto> list = new ArrayList<>();
         // FromProto.Builder, extracted to avoid excessive line widths.
@@ -281,7 +279,6 @@ public void testFormAction() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testFormActionWithLegalDisclaimer() {
         ArrayList<ActionProto> list = new ArrayList<>();
         FormProto.Builder formProto =
@@ -334,7 +331,6 @@ public void testFormActionWithLegalDisclaimer() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testFormActionClickLink() {
         ArrayList<ActionProto> list = new ArrayList<>();
         // FromProto.Builder, extracted to avoid excessive line widths.
@@ -400,7 +396,6 @@ public void testFormActionClickLink() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testInfoPopup() {
         ArrayList<ActionProto> list = new ArrayList<>();
         // FromProto.Builder, extracted to avoid excessive line widths.
@@ -475,7 +470,6 @@ public void testInfoPopup() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testInfoPopupNoButtons() {
         ArrayList<ActionProto> list = new ArrayList<>();
         // FromProto.Builder, extracted to avoid excessive line widths.
@@ -521,7 +515,6 @@ public void testInfoPopupNoButtons() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testMultipleForms() {
         ArrayList<ActionProto> list = new ArrayList<>();
         // FromProto.Builder, extracted to avoid excessive line widths.
@@ -622,7 +615,6 @@ private void startTestCounterExpansion(boolean accessibilityEnabled) {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testCounterExpandEnabledWithoutAccessibility() {
         startTestCounterExpansion(false);
 
@@ -633,7 +625,6 @@ public void testCounterExpandEnabledWithoutAccessibility() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     // When both START_SURFACE_ANDROID and TAB_GROUPS_CONTINUATION_ANDROID are enabled, changing
     // accessibility status won't recreate ChromeTabbedActivity.
     @EnableFeatures({ChromeFeatureList.START_SURFACE_ANDROID,

diff --git a/...ts/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java b/...ts/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java
@@ -325,7 +325,6 @@ private ValueComparisonProto createValueComparison(ValueReferenceProto valueA,
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testStaticUserInterface() {
         DrawableProto roundedRect =
                 DrawableProto.newBuilder()
@@ -414,7 +413,6 @@ public void testStaticUserInterface() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     @DisabledTest(message = "crbug.com/1087042")
     public void testOnViewClickedWriteToModel() {
         ViewProto clickableView1 = ViewProto.newBuilder()
@@ -565,7 +563,6 @@ public void testOnViewClickedWriteToModel() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testCallbackChain() {
         ViewProto clickableView =
                 ViewProto.newBuilder()
@@ -723,7 +720,6 @@ public void testCallbackChain() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testShowInfoPopupOnClick() {
         ViewProto clickableView = ViewProto.newBuilder()
                                           .setTextView(TextViewProto.newBuilder().setText(
@@ -798,7 +794,6 @@ public void testShowInfoPopupOnClick() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testListPopup() {
         List<InteractionProto> interactions = new ArrayList<>();
         interactions.add(
@@ -919,7 +914,6 @@ public void testListPopup() {
 
     @Test
     @MediumTest
-    @DisableIf.Build(sdk_is_less_than = 21)
     public void testMandatoryFields() {
         ViewProto clickableView1 = ViewProto.newBuilder()
                                            .setTextView(TextViewProto.newBuilder().setText(

diff --git a/...droid/javatests/src/org/chromium/chrome/browser/tracing/settings/TracingSettingsTest.java b/...droid/javatests/src/org/chromium/chrome/browser/tracing/settings/TracingSettingsTest.java
@@ -145,7 +145,6 @@ public void onTracingStateChanged(@TracingController.State int state) {
     @MediumTest
     @Feature({"Preferences"})
     @DisabledTest(message = "crbug.com/1111655")
-    @DisableIf.Build(sdk_is_less_than = 21, message = "crbug.com/899894")
     public void testRecordTrace() throws Exception {
         mActivityTestRule.startMainActivityOnBlankPage();
         mSettingsActivityTestRule.startSettingsActivity();

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/video/VideoTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/video/VideoTest.java
@@ -15,7 +15,6 @@
 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.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
@@ -38,7 +37,6 @@ public class VideoTest {
     public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
 
     @Test
-    @DisableIf.Build(sdk_is_less_than = 19, message = "crbug.com/582067")
     @Feature({"Media", "Media-Video", "Main"})
     @LargeTest
     public void testLoadMediaUrl() throws TimeoutException {

diff --git a/.../android/javatests/src/org/chromium/content/browser/TracingControllerAndroidImplTest.java b/.../android/javatests/src/org/chromium/content/browser/TracingControllerAndroidImplTest.java
@@ -18,7 +18,6 @@
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CriteriaHelper;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_shell_apk.ContentShellActivity;
@@ -42,7 +41,6 @@ public class TracingControllerAndroidImplTest {
     @Test
     @MediumTest
     @Feature({"GPU"})
-    @DisableIf.Build(sdk_is_less_than = 21, message = "crbug.com/899894")
     public void testTraceFileCreation() {
         ContentShellActivity activity = mActivityTestRule.launchContentShellWithUrl("about:blank");
         mActivityTestRule.waitForActiveShellToBeDoneLoading();
@@ -128,7 +126,6 @@ public void testBufferUsage() throws Exception {
     @Test
     @MediumTest
     @Feature({"GPU"})
-    @DisableIf.Build(sdk_is_less_than = 21, message = "crbug.com/899894")
     public void testStopCallbackAndCompression() throws Exception {
         ContentShellActivity activity = mActivityTestRule.launchContentShellWithUrl("about:blank");
         mActivityTestRule.waitForActiveShellToBeDoneLoading();
@@ -166,7 +163,6 @@ public void testStopCallbackAndCompression() throws Exception {
     @Test
     @MediumTest
     @Feature({"GPU"})
-    @DisableIf.Build(sdk_is_less_than = 21, message = "crbug.com/899894")
     public void testProtobufTracing() throws Exception {
         ContentShellActivity activity = mActivityTestRule.launchContentShellWithUrl("about:blank");
         mActivityTestRule.waitForActiveShellToBeDoneLoading();