Remove extension-to-component migration mechanism

chrome/browser/ui/toolbar/toolbar_actions_model.h

Index: chrome/browser/ui/toolbar/toolbar_actions_model.h
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
index e19df0e001739661e9d8b47930ba5cb732c6d9f2..7a4ac3f4870ba17d0ceaa7eacbc99aee844d9bfc 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
@@ -12,8 +12,8 @@
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/component_migration_helper.h"
 #include "chrome/browser/extensions/extension_action.h"
+#include "chrome/browser/ui/toolbar/component_action_delegate.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "extensions/browser/extension_prefs.h"
@@ -39,11 +39,10 @@ class ExtensionRegistry;
 // overflow menu on a per-window basis. Callers interested in the arrangement of
 // actions in a particular window should check that window's instance of
 // ToolbarActionsBar, which is responsible for the per-window layout.
-class ToolbarActionsModel
-    : public extensions::ExtensionActionAPI::Observer,
-      public extensions::ExtensionRegistryObserver,
-      public KeyedService,
-      public extensions::ComponentMigrationHelper::ComponentActionDelegate {
+class ToolbarActionsModel : public extensions::ExtensionActionAPI::Observer,
+                            public extensions::ExtensionRegistryObserver,
+                            public KeyedService,
+                            public ComponentActionDelegate {
  public:
   // The different options for highlighting.
   enum HighlightType {
@@ -163,10 +162,6 @@ class ToolbarActionsModel
     return is_highlighting() ? highlighted_items_ : toolbar_items_;
   }
 
-  extensions::ComponentMigrationHelper* component_migration_helper() {
-    return component_migration_helper_.get();
-  }
-
   bool is_highlighting() const { return highlight_type_ != HIGHLIGHT_NONE; }
   HighlightType highlight_type() const { return highlight_type_; }
 
@@ -177,7 +172,7 @@ class ToolbarActionsModel
 
   void SetActionVisibility(const std::string& action_id, bool visible);
 
-  // ComponentMigrationHelper::ComponentActionDelegate:
+  // ComponentActionDelegate:
   // AddComponentAction() is a no-op if |actions_initialized_| is false.
   void AddComponentAction(const std::string& action_id) override;
   void RemoveComponentAction(const std::string& action_id) override;
@@ -291,10 +286,6 @@ class ToolbarActionsModel
   // The ExtensionActionManager, cached for convenience.
   extensions::ExtensionActionManager* extension_action_manager_;
 
-  // The ComponentMigrationHelper.
-  std::unique_ptr<extensions::ComponentMigrationHelper>
-      component_migration_helper_;
-
   // True if we've handled the initial EXTENSIONS_READY notification.
   bool actions_initialized_;