| Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
|
| index 058054f95beb2947081f4ae1c2a93770eec27ec5..89e667cc8250f54290a7a473a475c2aeb8819324 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
|
| @@ -12,7 +12,6 @@
|
| import android.view.ContextMenu;
|
| import android.view.KeyEvent;
|
|
|
| -import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.test.util.CallbackHelper;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| import org.chromium.base.test.util.Feature;
|
| @@ -22,7 +21,6 @@
|
| import org.chromium.chrome.browser.ChromeSwitches;
|
| import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
|
| import org.chromium.chrome.browser.download.DownloadTestBase;
|
| -import org.chromium.chrome.browser.firstrun.FirstRunStatus;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
|
| import org.chromium.chrome.browser.tabmodel.TabModel;
|
| @@ -41,9 +39,7 @@
|
| /**
|
| * Context menu related tests
|
| */
|
| -@CommandLineFlags.Add({
|
| - ChromeSwitches.GOOGLE_BASE_URL + "=http://example.com/",
|
| - ChromeSwitches.HERB_FLAVOR_DISABLED_SWITCH})
|
| +@CommandLineFlags.Add(ChromeSwitches.GOOGLE_BASE_URL + "=http://example.com/")
|
| public class ContextMenuTest extends DownloadTestBase {
|
| private static final String TEST_PATH =
|
| "/chrome/test/data/android/contextmenu/context_menu_test.html";
|
| @@ -65,24 +61,11 @@
|
| mTestUrl = mTestServer.getURL(TEST_PATH);
|
| deleteTestFiles();
|
| super.setUp();
|
| -
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - FirstRunStatus.setFirstRunFlowComplete(true);
|
| - }
|
| - });
|
| }
|
|
|
| @Override
|
| protected void tearDown() throws Exception {
|
| mTestServer.stopAndDestroyServer();
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - FirstRunStatus.setFirstRunFlowComplete(false);
|
| - }
|
| - });
|
| deleteTestFiles();
|
| super.tearDown();
|
| }
|
|
|