🏠 Merge the context menu code for NTP tiles and suggestions

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
index ad074aff2f1a502c90e1dc5f932d04d60c708c04..786edfe0d031165977fe36e6d4eef13904c268a0 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
@@ -268,7 +268,7 @@ public void run() {
     @Feature({"NewTabPage"})
     public void testOpenMostVisitedItemInNewTab() throws InterruptedException {
         invokeContextMenuAndOpenInANewTab(mMostVisitedLayout.getChildAt(0),
-                NewTabPage.ID_OPEN_IN_NEW_TAB, false, mFakeMostVisitedUrls[0]);
+                ContextMenuHandler.ID_OPEN_IN_NEW_TAB, false, mFakeMostVisitedUrls[0]);
     }
 
     /**
@@ -278,7 +278,7 @@ public void testOpenMostVisitedItemInNewTab() throws InterruptedException {
     @Feature({"NewTabPage"})
     public void testOpenMostVisitedItemInIncognitoTab() throws InterruptedException {
         invokeContextMenuAndOpenInANewTab(mMostVisitedLayout.getChildAt(0),
-                NewTabPage.ID_OPEN_IN_INCOGNITO_TAB, true, mFakeMostVisitedUrls[0]);
+                ContextMenuHandler.ID_OPEN_IN_INCOGNITO_TAB, true, mFakeMostVisitedUrls[0]);
     }
 
     /**
@@ -294,8 +294,8 @@ public void testRemoveMostVisitedItem() {
         assertEquals(1, views.size());
 
         TestTouchUtils.longClickView(getInstrumentation(), mostVisitedItem);
-        assertTrue(getInstrumentation().invokeContextMenuAction(getActivity(),
-                NewTabPage.ID_REMOVE, 0));
+        assertTrue(getInstrumentation().invokeContextMenuAction(
+                getActivity(), ContextMenuHandler.ID_REMOVE, 0));
 
         assertTrue(mFakeMostVisitedSites.isUrlBlacklisted(mFakeMostVisitedUrls[0]));
     }