Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
index bc603373765673263388efc3def5dd936f4ce845..f0256a84c5adc130698bf7292e7ea95a3dc2e91f 100644
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
@@ -17,21 +17,20 @@ class MockComponentToolbarActionsFactory
  public:
   static const char kActionIdForTesting[];
 
-  explicit MockComponentToolbarActionsFactory(Browser* browser);
+  MockComponentToolbarActionsFactory(Profile* profile,
+                                     ToolbarActionsModel* actions_model);
   ~MockComponentToolbarActionsFactory() override;
 
   // ComponentToolbarActionsFactory:
-  std::set<std::string> GetInitialComponentIds(Profile* profile) override;
+  std::set<std::string> GetInitialComponentIds() override;
   std::unique_ptr<ToolbarActionViewController> GetComponentToolbarActionForId(
       const std::string& id,
       Browser* browser,
       ToolbarActionsBar* bar) override;
 

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

nit: no blank lines between overrides for the same base class

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

Removed migration-related code.

-  void RegisterComponentMigrations(
-      extensions::ComponentMigrationHelper* helper) const override;
+  void RegisterComponentMigrations() override;
 

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

ditto nit

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

Removed migration-related code.

-  void HandleComponentMigrations(extensions::ComponentMigrationHelper* helper,
-                                 Profile* profile) const override;
+  void HandleComponentMigrations() override;
 
   void set_migrated_extension_id(const extensions::ExtensionId& extension_id) {
     migrated_extension_id_ = extension_id;