Bug 1215586 : Remove icon property from menu addon r=margaret

--HG--
extra : commitid : 9dF9NpHiB6O
extra : rebase_source : a84e7d9836d80a180c44bfb5933c1eb4bc7f9609

mobile/android/base/BrowserApp.java

@@ -209,7 +209,6 @@ public class BrowserApp extends GeckoApp
     private static class MenuItemInfo {
         public int id;
         public String label;
-        public String icon;
         public boolean checkable;
         public boolean checked;
         public boolean enabled = true;
@@ -1763,7 +1762,6 @@ public class BrowserApp extends GeckoApp
             final MenuItemInfo info = new MenuItemInfo();
             info.label = message.getString("name");
             info.id = message.getInt("id") + ADDON_MENU_OFFSET;
-            info.icon = message.optString("icon", null);
             info.checked = message.optBoolean("checked", false);
             info.enabled = message.optBoolean("enabled", true);
             info.visible = message.optBoolean("visible", true);

mobile/android/chrome/content/browser.js

@@ -2317,9 +2317,9 @@ var NativeWindow = {
       if (arguments.length == 1) {
         options = arguments[0];
       } else if (arguments.length == 3) {
+          Log.w("Browser", "This menu addon API has been deprecated. Instead, use the options object API.");
           options = {
             name: arguments[0],
-            icon: arguments[1],
             callback: arguments[2]
           };
       } else {