Move BrowserAction out of Extension

chrome/browser/extensions/extension_action_manager.cc

Index: chrome/browser/extensions/extension_action_manager.cc
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index 41018bfb5125c9b8772e423214a896c0b77e660c..01cdabebbb346f6f2eb7d5b82a0ed127657f9a04 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/extensions/api/extension_action/script_badge_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "content/public/browser/notification_service.h"
@@ -130,7 +129,8 @@ ExtensionAction* ExtensionActionManager::GetPageAction(
 
 ExtensionAction* ExtensionActionManager::GetBrowserAction(
     const extensions::Extension& extension) const {
-  const ActionInfo* action_info = extension.browser_action_info();
+  const ActionInfo* action_info =
+      ActionInfoData::GetBrowserActionInfo(&extension);
   ActionInfo::Type action_type = ActionInfo::TYPE_BROWSER;
   if (FeatureSwitch::script_badges()->IsEnabled() &&
       extension.page_action_info()) {
@@ -161,7 +161,7 @@ ExtensionAction* ExtensionActionManager::GetScriptBadge(
     const extensions::Extension& extension) const {
   return GetOrCreateOrNull(&script_badges_, extension.id(),
                            ActionInfo::TYPE_SCRIPT_BADGE,
-                           ScriptBadgeInfo::GetScriptBadge(&extension));
+                           ActionInfoData::GetScriptBadgeInfo(&extension));
 }
 
 }  // namespace extensions