Add a "key" entry to InstallWarnings, remove InstallWarning::Format

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 e58f89a8c98ff985c0fa0ec91f7a4eb1da62b805..bf7acd1d4491e4c54765c0c66151a41f10605e85 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -45,8 +45,7 @@ bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   // going to have any effect.
   if (!FeatureSwitch::script_badges()->IsEnabled()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeRequiresFlag));
+        InstallWarning(errors::kScriptBadgeRequiresFlag, keys::kScriptBadge));
   }
 
   const base::DictionaryValue* dict = NULL;
@@ -68,14 +67,16 @@ bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
 
   if (!action_info->default_title.empty()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeTitleIgnored));
+        InstallWarning(errors::kScriptBadgeTitleIgnored,
+                       keys::kScriptBadge,
+                       keys::kPageActionDefaultTitle));
   }
 
   if (!action_info->default_icon.empty()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeIconIgnored));
+        InstallWarning(errors::kScriptBadgeIconIgnored,
+                       keys::kScriptBadge,
+                       keys::kPageActionDefaultIcon));
   }
 
   SetActionInfoDefaults(extension, action_info.get());