Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization

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"
@@ skipping 134 matching lines @@
     // bounds.
     return visible_icon_count_ == -1
                ? toolbar_items().size()
                : std::min(static_cast<size_t>(visible_icon_count_),
                           toolbar_items().size());
   }
   bool all_icons_visible() const {
     return visible_icon_count() == toolbar_items().size();
   }
 
-  bool actions_initialized() const { return actions_initialized_; }
-
   ScopedVector<ToolbarActionViewController> CreateActions(
       Browser* browser,
       ToolbarActionsBar* bar);
   std::unique_ptr<ToolbarActionViewController> CreateActionForItem(
       Browser* browser,
       ToolbarActionsBar* bar,
       const ToolbarItem& item);
 
   const std::vector<ToolbarItem>& toolbar_items() const {
     return is_highlighting() ? highlighted_items_ : toolbar_items_;
@@ skipping 10 matching lines @@
   void set_has_active_bubble(bool has_active_bubble) {
     has_active_bubble_ = has_active_bubble;
   }
 
   void SetActionVisibility(const std::string& action_id, bool visible);
 
   // ComponentMigrationHelper::ComponentActionDelegate:
   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;
+  bool ActionsInitialized() 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);
@@ skipping 140 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_