🤠 Disable failing MediaCaptureTests on L/M Tablets

Same as in:
https://chromium-review.googlesource.com/c/chromium/src/+/2306043
Disable failing MediaCapture tests on Lollipop and
Marshmallow Tablet Tester bots.

Tests:
MediaCaptureTest#testMediaCapture_basic
MediaCaptureTest#testMediaCapture_rememberPermission
MediaCaptureTest#testMediaCapture_twoStreams
MediaCaptureTest#testMediaCapture_twoStreamsNotification

For unknown reasons, the previous patch was ineffective. This patch
tries to disable based on the Android version.

BUG=1107380
TBR=estade@chromium.org

Change-Id: I471cbaa1b29f47c378c9fc03a394aa39f089944b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2311579Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790762}

weblayer/browser/android/javatests/BUILD.gn

@@ -88,7 +88,6 @@ android_library("weblayer_private_java_tests") {
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",
-    "//ui/android:ui_java_test_support",
     "//weblayer/public/java",
     "//weblayer/public/javatestutil:test_java",
     "//weblayer/shell/android:weblayer_shell_java",

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/MediaCaptureTest.java

@@ -28,7 +28,6 @@ import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.test.util.UiDisableIf;
 import org.chromium.weblayer.MediaCaptureCallback;
 import org.chromium.weblayer.TestWebLayer;
 import org.chromium.weblayer.shell.InstrumentationActivity;
@@ -88,8 +87,10 @@ public final class MediaCaptureTest {
      */
     @Test
     @MediumTest
-    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
-    public void testMediaCapture_basic() throws Throwable {
+    @DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
+            message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
+    public void
+    testMediaCapture_basic() throws Throwable {
         mActivityTestRule.navigateAndWait(
                 mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia.html"));
 
@@ -118,8 +119,10 @@ public final class MediaCaptureTest {
      */
     @Test
     @MediumTest
-    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
-    public void testMediaCapture_rememberPermission() throws Throwable {
+    @DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
+            message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
+    public void
+    testMediaCapture_rememberPermission() throws Throwable {
         mActivityTestRule.navigateAndWait(
                 mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia.html"));
 
@@ -148,8 +151,10 @@ public final class MediaCaptureTest {
      */
     @Test
     @MediumTest
-    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
-    public void testMediaCapture_twoStreams() throws Throwable {
+    @DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
+            message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
+    public void
+    testMediaCapture_twoStreams() throws Throwable {
         mActivityTestRule.navigateAndWait(
                 mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html"));
 
@@ -177,8 +182,10 @@ public final class MediaCaptureTest {
     @Test
     @MediumTest
     @MinAndroidSdkLevel(Build.VERSION_CODES.M)
-    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1107380
-    public void testMediaCapture_twoStreamsNotification() throws Throwable {
+    @DisableIf.Build(sdk_is_greater_than = 20, sdk_is_less_than = 24,
+            message = "Failing on {Lollipop,Marshmallow} Tablet Tester. https://crbug.com/1107380")
+    public void
+    testMediaCapture_twoStreamsNotification() throws Throwable {
         mActivityTestRule.navigateAndWait(
                 mActivityTestRule.getTestServer().getURL("/weblayer/test/data/getusermedia2.html"));