Move BrowserAction out of Extension

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 f280d6ffdbed530b2b79ca092468890817b722df..3808bfd171e673ff015720d682b7c6b9b4e10efa 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -17,21 +17,6 @@ namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
-ScriptBadgeInfo::ScriptBadgeInfo(ActionInfo* action_info)
-    : script_badge_info(action_info) {
-}
-
-ScriptBadgeInfo::~ScriptBadgeInfo() {
-}
-
-// static
-const ActionInfo* ScriptBadgeInfo::GetScriptBadge(
-    const Extension* extension) {
-  ScriptBadgeInfo* info = static_cast<ScriptBadgeInfo*>(
-      extension->GetManifestData(extension_manifest_keys::kScriptBadge));
-  return info ? info->script_badge_info.get() : NULL;
-}
-
 ScriptBadgeHandler::ScriptBadgeHandler() {
 }
 
@@ -83,7 +68,7 @@ bool ScriptBadgeHandler::Parse(const base::Value* value,
 
   SetActionInfoDefaults(extension, action_info.get());
   extension->SetManifestData(extension_manifest_keys::kScriptBadge,
-                             new ScriptBadgeInfo(action_info.release()));
+                             new ActionInfoData(action_info.release()));
   return true;
 }
 
@@ -91,7 +76,7 @@ bool ScriptBadgeHandler::HasNoKey(Extension* extension, string16* error) {
   scoped_ptr<ActionInfo> action_info(new ActionInfo);
   SetActionInfoDefaults(extension, action_info.get());
   extension->SetManifestData(extension_manifest_keys::kScriptBadge,
-                             new ScriptBadgeInfo(action_info.release()));
+                             new ActionInfoData(action_info.release()));
   return true;
 }