Move Icons out of Extension class

chrome/common/extensions/api/extension_action/script_badge_handler.cc

Index: chrome/common/extensions/api/extension_action/script_badge_handler.cc
diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.cc b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
index c01e0720fa8233b1c27d12c5948a99108ed48618..444b80d140c65efb95ce1923079d0f28fb1437d1 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -7,6 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -20,11 +21,16 @@ namespace errors = extension_manifest_errors;
 namespace extensions {
 
 ScriptBadgeHandler::ScriptBadgeHandler() {
+  prerequisite_keys_.push_back(extension_manifest_keys::kIcons);
 }
 
 ScriptBadgeHandler::~ScriptBadgeHandler() {
 }
 
+const std::vector<std::string>& ScriptBadgeHandler::PrerequisiteKeys() {

[Yoyo Zhou, 2013/02/27 20:09:14]

By the way, I later realized, it doesn't make sense to return by reference here.
If you want to change it so that it doesn't, feel free; otherwise, I'll do it in
my pending CL.

+  return prerequisite_keys_;
+}
+
 bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   scoped_ptr<ActionInfo> action_info(new ActionInfo);
 
@@ -89,7 +95,7 @@ void ScriptBadgeHandler::SetActionInfoDefaults(const Extension* extension,
   info->default_title = extension->name();
   info->default_icon.Clear();
   for (size_t i = 0; i < extension_misc::kNumScriptBadgeIconSizes; ++i) {
-    std::string path = extension->icons().Get(
+    std::string path = IconsInfo::GetIcons(extension).Get(
         extension_misc::kScriptBadgeIconSizes[i],
         ExtensionIconSet::MATCH_BIGGER);
     if (!path.empty()) {