Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/toolbar_actions_model.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
 
 #include <stddef.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #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/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"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/extension.h"
 
 class Browser;
+class ComponentToolbarActionsFactory;
 class PrefService;
 class Profile;
 class ToolbarActionsBar;
 class ToolbarActionViewController;
 
 namespace extensions {
 class ExtensionActionManager;
 class ExtensionMessageBubbleController;
 class ExtensionRegistry;
 }
@@ skipping 129 matching lines @@
   }
 
   bool is_highlighting() const { return highlight_type_ != HIGHLIGHT_NONE; }
   HighlightType highlight_type() const { return highlight_type_; }
 
   bool has_active_bubble() const { return has_active_bubble_; }
   void set_has_active_bubble(bool has_active_bubble) {
     has_active_bubble_ = has_active_bubble;
   }
 
+  ComponentToolbarActionsFactory* component_actions_factory() {
+    return component_actions_factory_.get();
+  }
+
   void SetActionVisibility(const std::string& action_id, bool visible);
 
   // 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;
   bool HasComponentAction(const std::string& action_id) const override;
 
   void OnActionToolbarPrefChange();
 
   // Highlights the actions specified by |action_ids|. This will cause
   // the ToolbarModel to only display those actions.
   // Highlighting mode is only entered if there is at least one action to be
   // shown.
   // Returns true if highlighting mode is entered, false otherwise.
   bool HighlightActions(const std::vector<std::string>& action_ids,
                         HighlightType type);
 
   // Stop highlighting actions. All actions can be shown again, and the
   // number of visible icons will be reset to what it was before highlighting.
   void StopHighlighting();
 
   // Gets the ExtensionMessageBubbleController that should be shown for this
   // profile, if any.
   std::unique_ptr<extensions::ExtensionMessageBubbleController>
   GetExtensionMessageBubbleController(Browser* browser);
 
+  // Sets the component action factory for this object. Used in tests.
+  void SetMockActionsFactoryForTest(
+      std::unique_ptr<ComponentToolbarActionsFactory> mock_factory);
+
  private:
   // Callback when actions are ready.
   void OnReady();
 
   // ExtensionRegistryObserver:
   void OnExtensionLoaded(content::BrowserContext* browser_context,
                          const extensions::Extension* extension) override;
   void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
@@ skipping 69 matching lines @@
 
   // The ExtensionActionAPI object, cached for convenience.
   extensions::ExtensionActionAPI* extension_action_api_;
 
   // The ExtensionRegistry object, cached for convenience.
   extensions::ExtensionRegistry* extension_registry_;
 
   // The ExtensionActionManager, cached for convenience.
   extensions::ExtensionActionManager* extension_action_manager_;
 
+  std::unique_ptr<ComponentToolbarActionsFactory> component_actions_factory_;
+
   // True if we've handled the initial EXTENSIONS_READY notification.
   bool actions_initialized_;
 
   // If true, we include all actions in the toolbar model.
   bool use_redesign_;
 
   // Ordered list of browser actions.
   std::vector<ToolbarItem> toolbar_items_;
 
   // List of browser actions which should be highlighted.
@@ skipping 30 matching lines @@
   // For observing change of toolbar order preference by external entity (sync).
   PrefChangeRegistrar pref_change_registrar_;
   base::Closure pref_change_callback_;
 
   base::WeakPtrFactory<ToolbarActionsModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_