Fix two bugs in the extension actions toolbar

chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

 // Copyright 2013 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/views/toolbar/browser_actions_container.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 211 matching lines @@
   // No icons should be visible, but we *should* show the chevron and have a
   // non-empty size.
   browser_actions_bar()->SetIconVisibilityCount(0);
   EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
   BrowserActionsContainer* container =
       BrowserView::GetBrowserViewForBrowser(browser())
           ->toolbar()->browser_actions();
   ASSERT_TRUE(container->chevron());
   EXPECT_TRUE(container->chevron()->visible());
   EXPECT_FALSE(container->GetPreferredSize().IsEmpty());
+
+  // Reset visibility count to 2. State should be A, B, [C], and the chevron
+  // should be visible.
+  browser_actions_bar()->SetIconVisibilityCount(2);
+  EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(1));
+  EXPECT_TRUE(container->chevron()->visible());
+
+  // Disable C (the overflowed extension). State should now be A, B, and the
+  // chevron should be hidden.
+  DisableExtension(idC);
+  EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(1));
+  EXPECT_FALSE(container->chevron()->visible());
+
+  // Re-enable C. We should still only have 2 visible icons, and the chevron
+  // should be visible.
+  EnableExtension(idC);
+  EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(1));
+  EXPECT_TRUE(container->chevron()->visible());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, ForceHide) {
   // Load extension A (contains browser action).
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("basics")));
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_TRUE(browser_actions_bar()->HasIcon(0));
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
@@ skipping 223 matching lines @@
   extensions::ExtensionActionAPI::SetBrowserActionVisibility(
       extensions::ExtensionPrefs::Get(profile()),
       extension_a->id(),
       false);
   overflow_bar()->Layout();  // Kick.
   EXPECT_EQ(extension_c, main_bar()->GetBrowserActionViewAt(0)->extension());
   EXPECT_EQ(extension_a, main_bar()->GetBrowserActionViewAt(1)->extension());
   EXPECT_EQ(extension_b, main_bar()->GetBrowserActionViewAt(2)->extension());
   EXPECT_TRUE(VerifyVisibleCount(1u));
 }