| Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| index 35b1d9688d655694a8d81fddb63f8529bb465d0d..4db918d58ecd32a466972fee7a5d7efbb8f6123e 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
|
| @@ -24,6 +24,7 @@ import android.view.ViewConfiguration;
|
| import org.chromium.base.ContextUtils;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| +import org.chromium.base.test.util.DisableIf;
|
| import org.chromium.base.test.util.DisabledTest;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.FlakyTest;
|
| @@ -1515,6 +1516,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testTapLimitForDecided() throws InterruptedException, TimeoutException {
|
| mPolicy.setTapLimitForDecidedForTesting(2);
|
| clickToTriggerPrefetch();
|
| @@ -1543,6 +1545,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testTapLimitForUndecided() throws InterruptedException, TimeoutException {
|
| mPolicy.setTapLimitForUndecidedForTesting(2);
|
| mPolicy.overrideDecidedStateForTesting(false);
|
| @@ -1693,6 +1696,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testAppMenuSuppressedWhenExpanded() throws InterruptedException, TimeoutException {
|
| clickWordNode("states");
|
| tapPeekingBarToExpandAndAssert();
|
| @@ -1784,6 +1788,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testPromoOpenCountForUndecided() throws InterruptedException, TimeoutException {
|
| mPolicy.overrideDecidedStateForTesting(false);
|
|
|
| @@ -1811,6 +1816,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testPromoOpenCountForDecided() throws InterruptedException, TimeoutException {
|
| mPolicy.overrideDecidedStateForTesting(true);
|
|
|
| @@ -2088,6 +2094,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
|
| @Feature({"ContextualSearch"})
|
| @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| @CommandLineFlags.Add(ContextualSearchFieldTrial.PEEK_PROMO_ENABLED + "=true")
|
| + @DisableIf.Build(supported_abis_includes = "arm64-v8a", message = "crbug.com/596533")
|
| public void testLongPressShowsPeekPromo() throws InterruptedException, TimeoutException {
|
| // Must be in undecided state in order to trigger the Peek Promo.
|
| mPolicy.overrideDecidedStateForTesting(false);
|
|
|