| 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 161af4479738ae93a33ed7579c6ff0cd11be8de2..aaf181f8f6cc6a8f9d7cd22a8122331580fe4546 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 | 
| @@ -9,7 +9,6 @@ import android.content.ClipboardManager; | 
| import android.content.Context; | 
| import android.os.Build; | 
| import android.test.FlakyTest; | 
| -import android.test.suitebuilder.annotation.LargeTest; | 
| import android.view.ContextMenu; | 
|  | 
| import junit.framework.Assert; | 
| @@ -17,11 +16,11 @@ import junit.framework.Assert; | 
| import org.chromium.base.test.util.Feature; | 
| import org.chromium.chrome.R; | 
| import org.chromium.chrome.browser.Tab; | 
| +import org.chromium.chrome.shell.ChromiumTestShellTestBase; | 
| import org.chromium.chrome.test.util.TabUtils; | 
| import org.chromium.chrome.test.util.TabUtils.TestCallbackHelperContainerForTab; | 
| import org.chromium.chrome.test.util.TestHttpServerClient; | 
| import org.chromium.chrome.test.util.browser.contextmenu.ContextMenuUtils; | 
| -import org.chromium.chrome.testshell.ChromiumTestShellTestBase; | 
| import org.chromium.content.browser.test.util.Criteria; | 
| import org.chromium.content.browser.test.util.CriteriaHelper; | 
| import org.chromium.content.browser.test.util.KeyUtils; | 
|  |