[CSN] Re-enable Tests
Re-enable
* ContinuousSearchTabHelperTest
* Started timing out on Tablets - should only run on phones so added
UiRestriction.
* ContinuousSearchUiTest
* Crashed on L
* Fixed as part of L crash fix https://crbug.com/1241626 but test
stayed disabled.
Bug: 1246411, 1242436
Change-Id: I02e27613f14948eed529071a11d5335f931d771f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3166272
Reviewed-by: Yashar Dabiran <yashard@chromium.org>
Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
Cr-Commit-Position: refs/heads/main@{#922519}
diff --git a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabHelperTest.java b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabHelperTest.java
index fb6f2ea..688e5e3 100644
--- a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabHelperTest.java
+++ b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchTabHelperTest.java
@@ -22,7 +22,7 @@
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ -37,6 +37,7 @@
import org.chromium.content_public.common.ContentSwitches;
import org.chromium.net.NetError;
import org.chromium.net.test.EmbeddedTestServer;
+import org.chromium.ui.test.util.UiRestriction;
import org.chromium.url.GURL;
import java.util.ArrayList;
@@ -206,7 +207,7 @@
@Test
@MediumTest
- @DisabledTest(message = "https://crbug.com/1246411")
+ @Restriction({UiRestriction.RESTRICTION_TYPE_PHONE})
public void testContinuousSearchFakeResults() throws TimeoutException {
WaitableContinuousNavigationUserDataObserver observer =
new WaitableContinuousNavigationUserDataObserver();
diff --git a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
index 899a4c3..614770e4 100644
--- a/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
+++ b/chrome/browser/continuous_search/android/javatests/org/chromium/chrome/browser/continuous_search/ContinuousSearchUiTest.java
@@ -35,7 +35,6 @@
import org.chromium.base.test.BaseActivityTestRule;
import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CallbackHelper;
-import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.JniMocker;
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator.VisibilitySettings;
@@ -135,7 +134,6 @@
*/
@Test
@SmallTest
- @DisabledTest(message = "https://crbug.com/1242436")
public void testScrollToSelected() throws TimeoutException {
GURL srpUrl = JUnitTestGURLs.getGURL(JUnitTestGURLs.SEARCH_URL);
GURL result1Url = JUnitTestGURLs.getGURL(JUnitTestGURLs.RED_1);
