| 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 94bf30e843cf85ae485b132d763372438163d8c0..4bf90288c1fd91f7d92369628855c61acea96cf9 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
|
| @@ -1060,7 +1060,7 @@
|
| * @SmallTest
|
| * @Feature({"ContextualSearch"})
|
| */
|
| - @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| @FlakyTest
|
| public void testTapExpand() throws InterruptedException, TimeoutException {
|
| assertNoSearchesLoaded();
|
| @@ -1861,7 +1861,7 @@
|
| * @SmallTest
|
| * @Feature({"ContextualSearch"})
|
| */
|
| - @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| @CommandLineFlags.Add({
|
| ContextualSearchFieldTrial.PROMO_ON_LIMITED_TAPS + "=true",
|
| ContextualSearchFieldTrial.TAP_TRIGGERED_PROMO_LIMIT + "=2"})
|
| @@ -2256,6 +2256,7 @@
|
| /**
|
| * Tests that tap followed by expand makes Content visible.
|
| */
|
| + @DisabledTest // https://crbug.com/551711
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| @@ -2277,6 +2278,7 @@
|
| * Tests that long press followed by expand creates Content and makes it visible.
|
| *
|
| */
|
| + @DisabledTest // https://crbug.com/551711
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| @@ -2299,9 +2301,10 @@
|
| /**
|
| * Tests swiping panel up and down after a tap search will only load the Content once.
|
| */
|
| - @SmallTest
|
| - @Feature({"ContextualSearch"})
|
| - @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisabledTest // https://crbug.com/551711
|
| + @SmallTest
|
| + @Feature({"ContextualSearch"})
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| public void testTapMultipleSwipeOnlyLoadsContentOnce()
|
| throws InterruptedException, TimeoutException {
|
| // Simulate a tap and make sure Content is not visible.
|
| @@ -2334,9 +2337,10 @@
|
| /**
|
| * Tests swiping panel up and down after a long press search will only load the Content once.
|
| */
|
| - @SmallTest
|
| - @Feature({"ContextualSearch"})
|
| - @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisabledTest // https://crbug.com/551711
|
| + @SmallTest
|
| + @Feature({"ContextualSearch"})
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| public void testLongPressMultipleSwipeOnlyLoadsContentOnce()
|
| throws InterruptedException, TimeoutException {
|
| // Simulate a long press and make sure no Content is created.
|
| @@ -2408,9 +2412,10 @@
|
| /**
|
| * Tests that chained searches load correctly.
|
| */
|
| - @SmallTest
|
| - @Feature({"ContextualSearch"})
|
| - @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| + @DisabledTest // https://crbug.com/551711
|
| + @SmallTest
|
| + @Feature({"ContextualSearch"})
|
| + @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
|
| public void testChainedSearchLoadsCorrectSearchTerm()
|
| throws InterruptedException, TimeoutException {
|
| // Simulate a tap and make sure Content is not visible.
|
| @@ -2453,6 +2458,7 @@
|
| /**
|
| * Tests that chained searches make Content visible when opening the Panel.
|
| */
|
| + @DisabledTest // https://crbug.com/551711
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
| @@ -2507,6 +2513,7 @@
|
| /**
|
| * Tests that a tap followed by opening the Panel does not remove the loaded URL from history.
|
| */
|
| + @DisabledTest // https://crbug.com/551711
|
| @SmallTest
|
| @Feature({"ContextualSearch"})
|
| @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
|
|
|