Split context menu display and population/handling

chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java
index 612c229f8256850b5a4d35d07a722fbb02234157..977044b8c968c592e4e5c6059481ed609391d464 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java
@@ -5,13 +5,17 @@
 package org.chromium.chrome.browser.tab;
 
 import android.content.Context;
+import android.util.Pair;
 import android.view.ContextMenu;
 
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuHelper;
+import org.chromium.chrome.browser.contextmenu.ContextMenuItem;
 import org.chromium.chrome.browser.contextmenu.ContextMenuParams;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
 
+import java.util.List;
+
 /**
  * A simple wrapper around a {@link ContextMenuPopulator} to handle observer notification.
  */
@@ -36,12 +40,15 @@ public class TabContextMenuPopulator implements ContextMenuPopulator {
     }
 
     @Override
-    public void buildContextMenu(ContextMenu menu, Context context, ContextMenuParams params) {
-        mPopulator.buildContextMenu(menu, context, params);
+    public List<Pair<Integer, List<ContextMenuItem>>> buildContextMenu(
+            ContextMenu menu, Context context, ContextMenuParams params) {
+        List<Pair<Integer, List<ContextMenuItem>>> itemGroups =
+                mPopulator.buildContextMenu(menu, context, params);
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {
             observers.next().onContextMenuShown(mTab, menu);
         }
+        return itemGroups;
     }
 
     @Override