Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
index 9d8bee3b4b7d7fd421248a6c3c84e53998527896..68015349f28c0e212634133c5f91df40483c8e73 100644
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h"
 
-#include "chrome/browser/ui/browser.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "extensions/common/feature_switch.h"
@@ -14,16 +14,13 @@ const char MockComponentToolbarActionsFactory::kActionIdForTesting[] =
     "mock_action";
 
 MockComponentToolbarActionsFactory::MockComponentToolbarActionsFactory(
-    Browser* browser) {
-  ComponentToolbarActionsFactory::SetTestingFactory(this);
-}
+    Profile* profile)
+    : ComponentToolbarActionsFactory(profile) {}
 
-MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
-  ComponentToolbarActionsFactory::SetTestingFactory(nullptr);
-}
+MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {}
 
 std::set<std::string>
-MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {
+MockComponentToolbarActionsFactory::GetInitialComponentIds() {
   std::set<std::string> ids;
   if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
     ids.insert(kActionIdForTesting);