Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 1440 matching lines @@
       base::Bind(&base::DoNothing),
       nullptr);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(2u, num_toolbar_items());
   EXPECT_EQ(1u, toolbar_model()->visible_icon_count());
   EXPECT_EQ(browser_action_a()->id(), GetActionIdAtIndex(0u));
   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(
       extensions::FeatureSwitch::extension_action_redesign(), true);
   InitForMigrationTest(MigrationStatus::FEATURE_ENABLED_NO_EXTENSION);
 
   EXPECT_EQ(0u, num_toolbar_items());
 }
 
 TEST_F(ToolbarActionsModelUnitTest, MigrationFromExtensionToComponentAction) {
@@ skipping 36 matching lines @@
 }
 
 TEST_F(ToolbarActionsModelUnitTest,
        MigrationToExtensionWithoutExtensionActionRedesign) {
   InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE);
 
   // Initialization re-enables the extension.
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u));
 }