Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index 43a232f2c6f8f405d0faf2f9bca2258c7c7b6399..d0ea37a5c7368d6a5996274e453dd93c7693cc04 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -1458,6 +1458,18 @@ TEST_F(ToolbarActionsModelUnitTest,
   EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(1u));
 }
 
+TEST_F(ToolbarActionsModelUnitTest, AddComponentActionBeforeInitialization) {
+  InitializeEmptyExtensionService();
+  ToolbarActionsModel* toolbar_model = extensions::extension_action_test_util::
+      CreateToolbarModelForProfileWithoutWaitingForReady(profile());
+  ASSERT_FALSE(toolbar_model->actions_initialized());
+
+  // AddComponentAction() should be a no-op if actions_initialized() is false.
+  toolbar_model->AddComponentAction(component_action_id());

[Devlin, 2016/10/26 16:41:56]

While this will trigger the crash, I think this would be more useful as a test
if it more closely replicated what was happening, where we were trying to
migrate MR over.

[takumif, 2016/10/26 18:42:06]

I believe this is close to what is happening. MRAController is calling
TAM::AddComponentAction() to show the icon ephemerally, and that sometimes
happens before TAM is initialized. I think it isn't really related to migration.

+  EXPECT_EQ(0u, toolbar_model->toolbar_items().size());
+  EXPECT_FALSE(toolbar_model->HasComponentAction(component_action_id()));
+}
+
 TEST_F(ToolbarActionsModelUnitTest,
        NoMigrationToComponentActionWithoutExtension) {
   extensions::FeatureSwitch::ScopedOverride enable_redesign(