Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

Issue 148523013: [Android] Rename TabBase to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2014_01_22_tabbase
Patch Set: sync Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 628c19a3544345951be00cdc07297f66d6f3c83c..161af4479738ae93a33ed7579c6ff0cd11be8de2 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
@@ -16,9 +16,9 @@ import junit.framework.Assert;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R;
-import org.chromium.chrome.browser.TabBase;
-import org.chromium.chrome.test.util.TabBaseTabUtils;
-import org.chromium.chrome.test.util.TabBaseTabUtils.TestCallbackHelperContainerForTab;
+import org.chromium.chrome.browser.Tab;
+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;
@@ -46,9 +46,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser", "Main"})
public void testCopyLinkURL() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenuUtils.selectContextMenuItem(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testLink",
+ TabUtils.getTestCallbackHelperContainer(tab), "testLink",
R.id.contextmenu_copy_link_address_text);
assertStringContains("test_link.html", getClipboardText());
@@ -59,9 +59,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testCopyImageLinkCopiesLinkURL() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenuUtils.selectContextMenuItem(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testImageLink",
+ TabUtils.getTestCallbackHelperContainer(tab), "testImageLink",
R.id.contextmenu_copy_link_address_text);
assertStringContains("test_link.html", getClipboardText());
@@ -72,9 +72,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testCopyLinkTextSimple() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenuUtils.selectContextMenuItem(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testLink",
+ TabUtils.getTestCallbackHelperContainer(tab), "testLink",
R.id.contextmenu_copy_link_text);
assertEquals("Clipboard text was not what was expected", "Test Link",
@@ -86,9 +86,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testCopyLinkTextComplex() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenuUtils.selectContextMenuItem(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "copyLinkTextComplex",
+ TabUtils.getTestCallbackHelperContainer(tab), "copyLinkTextComplex",
R.id.contextmenu_copy_link_text);
assertEquals("Clipboard text was not what was expected",
@@ -102,9 +102,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
public void testCopyImageToClipboard() throws InterruptedException, TimeoutException {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenuUtils.selectContextMenuItem(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testImage",
+ TabUtils.getTestCallbackHelperContainer(tab), "testImage",
R.id.contextmenu_copy_image);
String expectedUrl = TestHttpServerClient.getUrl(
@@ -118,10 +118,10 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testLongPressOnImage() throws InterruptedException, TimeoutException {
- final TabBase tab = getActivity().getActiveTab();
+ final Tab tab = getActivity().getActiveTab();
TestCallbackHelperContainerForTab helper =
- TabBaseTabUtils.getTestCallbackHelperContainer(tab);
+ TabUtils.getTestCallbackHelperContainer(tab);
OnPageFinishedHelper callback = helper.getOnPageFinishedHelper();
int callbackCount = callback.getCallCount();
@@ -150,10 +150,10 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testLongPressOnImageLink() throws InterruptedException, TimeoutException {
- final TabBase tab = getActivity().getActiveTab();
+ final Tab tab = getActivity().getActiveTab();
TestCallbackHelperContainerForTab helper =
- TabBaseTabUtils.getTestCallbackHelperContainer(tab);
+ TabUtils.getTestCallbackHelperContainer(tab);
OnPageFinishedHelper callback = helper.getOnPageFinishedHelper();
int callbackCount = callback.getCallCount();
@@ -179,9 +179,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testDismissContextMenuOnBack() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenu menu = ContextMenuUtils.openContextMenu(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testImage");
+ TabUtils.getTestCallbackHelperContainer(tab), "testImage");
assertNotNull("Context menu was not properly created", menu);
assertFalse("Context menu did not have window focus", getActivity().hasWindowFocus());
@@ -201,9 +201,9 @@ public class ContextMenuTest extends ChromiumTestShellTestBase {
// @LargeTest
@Feature({"Browser"})
public void testDismissContextMenuOnClick() throws InterruptedException, TimeoutException {
- TabBase tab = getActivity().getActiveTab();
+ Tab tab = getActivity().getActiveTab();
ContextMenu menu = ContextMenuUtils.openContextMenu(this, tab,
- TabBaseTabUtils.getTestCallbackHelperContainer(tab), "testImage");
+ TabUtils.getTestCallbackHelperContainer(tab), "testImage");
assertNotNull("Context menu was not properly created", menu);
assertFalse("Context menu did not have window focus", getActivity().hasWindowFocus());
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698