Chromium Code Reviews| 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 c6707dcdd1f2fab903fbd04632327e913d4ba523..3c7ff94e3c42115a2e622477e7594af695f49247 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 |
| @@ -76,7 +76,7 @@ import java.util.concurrent.TimeoutException; |
| /** |
| * Tests the Contextual Search Manager using instrumentation tests. |
| */ |
| -@CommandLineFlags.Add(ContextualSearchFieldTrial.SUPPRESSION_TAPS + "=1000") |
| + |
| public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> { |
| private static final String TEST_PAGE = |
| @@ -90,6 +90,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro |
| private static final String NORMAL_PRIORITY_SEARCH_ENDPOINT = "/search?"; |
| private static final String LOW_PRIORITY_SEARCH_ENDPOINT = "/s?"; |
| private static final String CONTEXTUAL_SEARCH_PREFETCH_PARAM = "&pf=c"; |
| + // The number of ms to delay startup when a URL is being loaded. |
| + private static final int ACTIVITY_STARTUP_DELAY_MS = 1000; |
|
Theresa
2016/08/11 20:35:44
Can we add a TODO note to fix this more correctly?
|
| private ActivityMonitor mActivityMonitor; |
| private ContextualSearchFakeServer mFakeServer; |
| @@ -221,7 +223,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro |
| @Override |
| public void startMainActivity() throws InterruptedException { |
| - startMainActivityWithURL(mTestServer.getURL(TEST_PAGE)); |
| + startMainActivityWithDelay(mTestServer.getURL(TEST_PAGE), ACTIVITY_STARTUP_DELAY_MS); |
|
Theresa
2016/08/11 20:35:44
I have a preference for putting the delay here ins
|
| } |
| //============================================================================================ |