Remove support for page_action.icons, and the legacy code surrounding it.

chrome/browser/extensions/api/extension_action/extension_actions_api.cc

Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
index 78a1815af961a2a4634ca560f2fe863649158e59..1a982f0ee52cc576c89dacb40ad589a8532d61a4 100644
--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
@@ -440,8 +440,8 @@ bool ExtensionActionHideFunction::RunExtensionAction() {
 bool ExtensionActionSetIconFunction::RunExtensionAction() {
   // setIcon can take a variant argument: either a dictionary of canvas
   // ImageData, or an icon index.
-  int icon_index;
   base::DictionaryValue* canvas_set = NULL;
+  int icon_index;
   if (details_->GetDictionary("imageData", &canvas_set)) {
     gfx::ImageSkia icon;
     // Extract icon representations from the ImageDataSet dictionary.
@@ -459,18 +459,8 @@ bool ExtensionActionSetIconFunction::RunExtensionAction() {
 
     extension_action_->SetIcon(tab_id_, gfx::Image(icon));
   } else if (details_->GetInteger("iconIndex", &icon_index)) {
-    // If --enable-script-badges is on there might legitimately be an iconIndex
-    // set. Until we decide what to do with that, ignore.
-    if (!GetExtension()->page_action())
-      return true;
-    if (icon_index < 0 ||
-        static_cast<size_t>(icon_index) >=
-            extension_action_->icon_paths()->size()) {
-      error_ = kIconIndexOutOfBounds;
-      return false;
-    }
-    extension_action_->SetIcon(tab_id_, gfx::Image());
-    extension_action_->SetIconIndex(tab_id_, icon_index);
+    // Obsolete argument: ignore it.
+    return true;

[Matt Perry, 2012/09/13 19:16:32]

Added this back to avoid a browser crash when extensions passed this argument.

   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }