| Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
|
| index 78fb02b9c4cde0aa74b63be792a1478e9b35ace6..a9b27f338e908fdbf15d0ad8822c3df12b5045e1 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
|
| @@ -60,6 +60,7 @@ import org.chromium.chrome.browser.TabsOpenedFromExternalAppTest;
|
| import org.chromium.chrome.browser.WarmupManager;
|
| import org.chromium.chrome.browser.appmenu.AppMenuHandler;
|
| import org.chromium.chrome.browser.document.ChromeLauncherActivity;
|
| +import org.chromium.chrome.browser.firstrun.FirstRunStatus;
|
| import org.chromium.chrome.browser.metrics.PageLoadMetrics;
|
| import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| @@ -142,6 +143,14 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
|
| @Override
|
| protected void setUp() throws Exception {
|
| super.setUp();
|
| +
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + FirstRunStatus.setFirstRunFlowComplete(true);
|
| + }
|
| + });
|
| +
|
| Context appContext = getInstrumentation().getTargetContext().getApplicationContext();
|
| mTestServer = EmbeddedTestServer.createAndStartServer(appContext);
|
| mTestPage = mTestServer.getURL(TEST_PAGE);
|
| @@ -153,6 +162,13 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
|
|
|
| @Override
|
| protected void tearDown() throws Exception {
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + FirstRunStatus.setFirstRunFlowComplete(false);
|
| + }
|
| + });
|
| +
|
| mTestServer.stopAndDestroyServer();
|
|
|
| // finish() is called on a non-UI thread by the testing harness. Must hide the menu
|
|
|