Change manifest handler interface to always (implicitly) pass the entire manifest to handlers.

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 f68d4a883fb8d49cea4bb4a9b833b01ccb9667a7..4c31b1a7cdd1ec511e2f77f7c7a3dc57ea697c3f 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -11,6 +11,7 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler_helpers.h"
 
 namespace errors = extension_manifest_errors;
@@ -23,9 +24,7 @@ ScriptBadgeHandler::ScriptBadgeHandler() {
 ScriptBadgeHandler::~ScriptBadgeHandler() {
 }
 
-bool ScriptBadgeHandler::Parse(const base::Value* value,
-                               Extension* extension,
-                               string16* error) {
+bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   scoped_ptr<ActionInfo> action_info(new ActionInfo);
 
   // So as to not confuse developers if they specify a script badge section
@@ -37,9 +36,18 @@ bool ScriptBadgeHandler::Parse(const base::Value* value,
                                   errors::kScriptBadgeRequiresFlag));
   }
 
+  // Provide a default script badge if one isn't declared in the manifest.
+  if (!extension->manifest()->HasKey(extension_manifest_keys::kScriptBadge)) {
+    scoped_ptr<ActionInfo> action_info(new ActionInfo);
+    SetActionInfoDefaults(extension, action_info.get());
+    ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
+    return true;
+  }
+
   const DictionaryValue* dict = NULL;
-  if (!value->GetAsDictionary(&dict)) {
-    *error = ASCIIToUTF16(extension_manifest_errors::kInvalidScriptBadge);
+  if (!extension->manifest()->GetDictionary(
+          extension_manifest_keys::kScriptBadge, &dict)) {
+    *error = ASCIIToUTF16(errors::kInvalidScriptBadge);
     return false;
   }
 
@@ -72,11 +80,8 @@ bool ScriptBadgeHandler::Parse(const base::Value* value,
   return true;
 }
 
-bool ScriptBadgeHandler::HasNoKey(Extension* extension, string16* error) {
-  scoped_ptr<ActionInfo> action_info(new ActionInfo);
-  SetActionInfoDefaults(extension, action_info.get());
-  ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
-  return true;
+bool ScriptBadgeHandler::AlwaysParseForType(Extension::Type type) {
+  return type == Extension::TYPE_EXTENSION;
 }
 
 void ScriptBadgeHandler::SetActionInfoDefaults(const Extension* extension,