Disable testRedirectionFromIntentWarm on M tablets

Possibly due to a bug on the version of M the tablet runs on (older than
the M phones we test on), or possibly due to the tablets being extremely
slow, this test times out on those devices.

This is extremely difficult to diagnose without access to a Nexus 7, and
not worth pursuing right now, so I'm disabling the test for that
configuration.

Bug: 1153686
Change-Id: I4e386f97b7052ebf0efc8c19f2683e21f73caafd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2588646Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836695}

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

@@ -11,6 +11,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
+import android.os.Build;
 import android.os.SystemClock;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.lifecycle.Stage;
@@ -54,6 +55,7 @@ import org.chromium.content_public.browser.test.util.DOMUtils;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_public.browser.test.util.TouchCommon;
 import org.chromium.net.test.EmbeddedTestServer;
+import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.url.GURL;
 
@@ -451,6 +453,11 @@ public class UrlOverridingTest {
     @SmallTest
     public void testRedirectionFromIntentWarm() throws Exception {
         Context context = ContextUtils.getApplicationContext();
+        // TODO(crbug.com/1153686): This test times out on M tablets.
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M
+                && DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
+            return;
+        }
         mActivityTestRule.startMainActivityOnBlankPage();
         Intent intent = new Intent(Intent.ACTION_VIEW,
                 Uri.parse(mTestServer.getURL(NAVIGATION_FROM_JAVA_REDIRECTION_PAGE)));