Keep the toolbar overflow menu the same when removing a component action

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 1412 matching lines @@
   EXPECT_TRUE(toolbar_model()->all_icons_visible());
 
   // Load extension C again.
   ASSERT_TRUE(AddExtension(browser_action_c()));
   EXPECT_EQ(5u, observer()->inserted_count());
   EXPECT_EQ(2u, num_toolbar_items());
   EXPECT_EQ(component_action_id(), GetActionIdAtIndex(0u));
   EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(1u));
 }
 
+TEST_F(ToolbarActionsModelUnitTest, AddAndRemoveComponentActionWithOVerflow) {
+  Init();
+  // Add three extension actions: A, B, C.
+  ASSERT_TRUE(AddBrowserActionExtensions());
+  EXPECT_EQ(3u, num_toolbar_items());
+
+  // Hide the last icon: A, B, [C].
+  toolbar_model()->SetVisibleIconCount(2);
+  EXPECT_EQ(2u, toolbar_model()->visible_icon_count());
+  EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(2u));
+
+  // Add a component action, CA. Now the icons should be: A, B, CA, [C].
+  toolbar_model()->AddComponentAction(component_action_id());
+  EXPECT_EQ(4u, num_toolbar_items());
+  EXPECT_EQ(3u, toolbar_model()->visible_icon_count());
+  EXPECT_EQ(component_action_id(), GetActionIdAtIndex(2u));
+  EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(3u));
+
+  // Remove the component action. Extension C should stay in the overflow.
+  // The icons should be: A, B, [C].
+  toolbar_model()->RemoveComponentAction(component_action_id());
+  EXPECT_EQ(3u, num_toolbar_items());
+  EXPECT_EQ(2u, toolbar_model()->visible_icon_count());
+  EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(2u));
+}
+
 TEST_F(ToolbarActionsModelUnitTest,
        TestUninstallVisibleExtensionDoesntBringOutOther) {
   Init();
   ASSERT_TRUE(AddBrowserActionExtensions());
   toolbar_model()->SetVisibleIconCount(2u);
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(2u, toolbar_model()->visible_icon_count());
   EXPECT_EQ(browser_action_a()->id(), GetActionIdAtIndex(0u));
   EXPECT_EQ(browser_action_b()->id(), GetActionIdAtIndex(1u));
   EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(2u));
@@ skipping 72 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));
 }