| Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
|
| index 745fd5d0123c3f4f30cb523008910bb0d91607af..5bcab244f1c09e112d01e42c3089c95e565fae2b 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/TabularContextMenuUiTest.java
|
| @@ -61,7 +61,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @SmallTest
|
| @Feature({"CustomContextMenu"})
|
| public void testViewDisplaysSingleItemProperly() throws ExecutionException {
|
| - final TabularContextMenuUi dialog = new TabularContextMenuUi();
|
| + final TabularContextMenuUi dialog = new TabularContextMenuUi(new ContextMenuHelper());
|
|
|
| final List<Pair<Integer, List<ContextMenuItem>>> itemGroups = new ArrayList<>();
|
| List<ContextMenuItem> item = CollectionUtil.newArrayList(ContextMenuItem.ADD_TO_CONTACTS,
|
| @@ -82,7 +82,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @SmallTest
|
| @Feature({"CustomContextMenu"})
|
| public void testViewDisplaysViewPagerForMultipleItems() throws ExecutionException {
|
| - final TabularContextMenuUi dialog = new TabularContextMenuUi();
|
| + final TabularContextMenuUi dialog = new TabularContextMenuUi(new ContextMenuHelper());
|
|
|
| final List<Pair<Integer, List<ContextMenuItem>>> itemGroups = new ArrayList<>();
|
| List<ContextMenuItem> item = CollectionUtil.newArrayList(ContextMenuItem.ADD_TO_CONTACTS,
|
| @@ -104,7 +104,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @SmallTest
|
| @Feature({"CustomContextMenu"})
|
| public void testURLIsShownOnContextMenu() throws ExecutionException {
|
| - final TabularContextMenuUi dialog = new TabularContextMenuUi();
|
| + final TabularContextMenuUi dialog = new TabularContextMenuUi(new ContextMenuHelper());
|
| final List<ContextMenuItem> item =
|
| CollectionUtil.newArrayList(ContextMenuItem.ADD_TO_CONTACTS, ContextMenuItem.CALL,
|
| ContextMenuItem.COPY_LINK_ADDRESS);
|
| @@ -113,7 +113,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @Override
|
| public View call() {
|
| return dialog.createContextMenuPageUi(
|
| - getActivity(), new MockMenuParams(expectedUrl), item, item.size());
|
| + getActivity(), new MockMenuParams(expectedUrl), item, false, item.size());
|
| }
|
| });
|
|
|
| @@ -124,7 +124,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @SmallTest
|
| @Feature({"CustomContextMenu"})
|
| public void testHeaderIsNotShownWhenThereIsNoParams() throws ExecutionException {
|
| - final TabularContextMenuUi dialog = new TabularContextMenuUi();
|
| + final TabularContextMenuUi dialog = new TabularContextMenuUi(new ContextMenuHelper());
|
| final List<ContextMenuItem> item =
|
| CollectionUtil.newArrayList(ContextMenuItem.ADD_TO_CONTACTS, ContextMenuItem.CALL,
|
| ContextMenuItem.COPY_LINK_ADDRESS);
|
| @@ -132,7 +132,7 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @Override
|
| public View call() {
|
| return dialog.createContextMenuPageUi(
|
| - getActivity(), new MockMenuParams(""), item, item.size());
|
| + getActivity(), new MockMenuParams(""), item, false, item.size());
|
| }
|
| });
|
|
|
| @@ -143,15 +143,15 @@ public class TabularContextMenuUiTest extends ChromeActivityTestCaseBase<ChromeA
|
| @SmallTest
|
| @Feature({"CustomContextMenu"})
|
| public void testLinkShowsMultipleLinesWhenClicked() throws ExecutionException {
|
| - final TabularContextMenuUi dialog = new TabularContextMenuUi();
|
| + final TabularContextMenuUi dialog = new TabularContextMenuUi(new ContextMenuHelper());
|
| final List<ContextMenuItem> item =
|
| CollectionUtil.newArrayList(ContextMenuItem.ADD_TO_CONTACTS, ContextMenuItem.CALL,
|
| ContextMenuItem.COPY_LINK_ADDRESS);
|
| View view = ThreadUtils.runOnUiThreadBlocking(new Callable<View>() {
|
| @Override
|
| public View call() {
|
| - return dialog.createContextMenuPageUi(
|
| - getActivity(), new MockMenuParams("http://google.com"), item, item.size());
|
| + return dialog.createContextMenuPageUi(getActivity(),
|
| + new MockMenuParams("http://google.com"), item, false, item.size());
|
| }
|
| });
|
|
|
|
|