Support Component Actions in the toolbar.

chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc

Index: chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc
diff --git a/chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc b/chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc
index 63763c378cb6af3c75e13073e73c12f7da370bcb..d355351e416a8f7991a17cd0cf5e122e9276635b 100644
--- a/chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc
+++ b/chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/chromium_strings.h"
@@ -54,8 +54,7 @@ bool ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
       return false;
   }
 
-  if (!extensions::ExtensionToolbarModel::Get(profile)->
-          RedesignIsShowingNewIcons()) {
+  if (!ToolbarActionsModel::Get(profile)->RedesignIsShowingNewIcons()) {
     // We only show the bubble if there are any new icons present - otherwise,
     // the user won't see anything different, so we treat it as acknowledged.
     AcknowledgeInPrefs(prefs);
@@ -103,5 +102,5 @@ void ExtensionToolbarIconSurfacingBubbleDelegate::OnBubbleClosed(
     CloseAction action) {
   if (action == CLOSE_EXECUTE)
     AcknowledgeInPrefs(profile_->GetPrefs());
-  extensions::ExtensionToolbarModel::Get(profile_)->StopHighlighting();
+  ToolbarActionsModel::Get(profile_)->StopHighlighting();
 }