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 f4e75a92de03938737b29b734c5563df7f11b96f..33395e8b875c8367fbec8848f7ed31dadbb3d62c 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,6 @@
 
 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h"
 
-#include "chrome/browser/ui/browser.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,17 +13,15 @@ const char MockComponentToolbarActionsFactory::kActionIdForTesting[] =
     "mock_action";
 
 MockComponentToolbarActionsFactory::MockComponentToolbarActionsFactory(
-    Browser* browser)
-    : migrated_feature_enabled_(false) {
-  ComponentToolbarActionsFactory::SetTestingFactory(this);
-}
+    Profile* profile,
+    ToolbarActionsModel* actions_model)
+    : ComponentToolbarActionsFactory(profile, actions_model),
+      migrated_feature_enabled_(false) {}
 
-MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
-  ComponentToolbarActionsFactory::SetTestingFactory(nullptr);
-}
+MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {}
 
 std::set<std::string>
-MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {
+MockComponentToolbarActionsFactory::GetInitialComponentIds() {
   std::set<std::string> ids;
   // kActionIdForTesting is installed by default if we are not testing
   // a migration scenario.
@@ -46,22 +43,19 @@ MockComponentToolbarActionsFactory::GetComponentToolbarActionForId(
           MockComponentToolbarActionsFactory::kActionIdForTesting));
 }
 
-void MockComponentToolbarActionsFactory::RegisterComponentMigrations(
-    extensions::ComponentMigrationHelper* helper) const {
+void MockComponentToolbarActionsFactory::RegisterComponentMigrations() {
   if (!migrated_extension_id_.empty()) {

[msw, 2017/01/10 23:23:59]

optional nit: curlies not needed

[takumif, 2017/02/17 03:22:51]

Removed migration-related code.

-    helper->Register(kActionIdForTesting, migrated_extension_id_);
+    migration_helper_.Register(kActionIdForTesting, migrated_extension_id_);
   }
 }
 
-void MockComponentToolbarActionsFactory::HandleComponentMigrations(
-    extensions::ComponentMigrationHelper* helper,
-    Profile* profile) const {
+void MockComponentToolbarActionsFactory::HandleComponentMigrations() {
   if (migrated_extension_id_.empty())
     return;
 
   if (migrated_feature_enabled_) {

[msw, 2017/01/10 23:23:59]

optional nit: curlies not needed

[takumif, 2017/02/17 03:22:51]

Removed migration-related code.

-    helper->OnFeatureEnabled(kActionIdForTesting);
+    migration_helper_.OnFeatureEnabled(kActionIdForTesting);
   } else {
-    helper->OnFeatureDisabled(kActionIdForTesting);
+    migration_helper_.OnFeatureDisabled(kActionIdForTesting);
   }
 }