Remove support for custom menu items in context menus.

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
index 7658126ecacc9b7eae8fdecff46b9a163247b593..d818e820b990ba20d604deaa0ce4e626244480ba 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.contextmenu;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.HapticFeedbackConstants;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
@@ -84,14 +83,8 @@ public class ContextMenuHelper implements OnCreateContextMenuListener, OnMenuIte
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         if (!shouldShowMenu(mCurrentContextMenuParams)) return;
 
-        if (mCurrentContextMenuParams.isCustomMenu()) {
-            for (int i = 0; i < mCurrentContextMenuParams.getCustomMenuSize(); i++) {
-                menu.add(Menu.NONE, i, Menu.NONE, mCurrentContextMenuParams.getCustomLabelAt(i));
-            }
-        } else {
-            assert mPopulator != null;
-            mPopulator.buildContextMenu(menu, v.getContext(), mCurrentContextMenuParams);
-        }
+        assert mPopulator != null;
+        mPopulator.buildContextMenu(menu, v.getContext(), mCurrentContextMenuParams);
 
         for (int i = 0; i < menu.size(); i++) {
             menu.getItem(i).setOnMenuItemClickListener(this);
@@ -100,15 +93,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener, OnMenuIte
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        if (mCurrentContextMenuParams.isCustomMenu()) {
-            if (mNativeContextMenuHelper != 0) {
-                final int action = mCurrentContextMenuParams.getCustomActionAt(item.getItemId());
-                nativeOnCustomItemSelected(mNativeContextMenuHelper, action);
-            }
-            return true;
-        } else {
-            return mPopulator.onItemSelected(this, mCurrentContextMenuParams, item.getItemId());
-        }
+        return mPopulator.onItemSelected(this, mCurrentContextMenuParams, item.getItemId());
     }
 
     /**
@@ -120,11 +105,8 @@ public class ContextMenuHelper implements OnCreateContextMenuListener, OnMenuIte
     }
 
     private boolean shouldShowMenu(ContextMenuParams params) {
-        // Custom menus are handled by this class and do not require a ContextMenuPopulator.
-        return params.isCustomMenu()
-                || (mPopulator != null && mPopulator.shouldShowContextMenu(params));
+        return (mPopulator != null && mPopulator.shouldShowContextMenu(params));
     }
 
     private native void nativeOnStartDownload(long nativeContextMenuHelper, boolean isLink);
-    private native void nativeOnCustomItemSelected(long nativeContextMenuHelper, int action);
 }