Make hiding an extension action cause it to go to the overflow menu

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"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_testing_views.h"
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/extension.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/view.h"
 
 using extensions::Extension;
 
 class BrowserActionsContainerTest : public ExtensionBrowserTest {
  public:
   BrowserActionsContainerTest() {
   }
   virtual ~BrowserActionsContainerTest() {}
 
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+    BrowserActionsContainer::disable_animations_during_testing_ = true;
+    ExtensionBrowserTest::SetUpCommandLine(command_line);
+  }
+
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionBrowserTest::SetUpOnMainThread();
     browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
   }
 
+  virtual void TearDownOnMainThread() OVERRIDE {
+    BrowserActionsContainer::disable_animations_during_testing_ = false;
+  }
+
   BrowserActionTestUtil* browser_actions_bar() {
     return browser_actions_bar_.get();
   }
 
  private:
   scoped_ptr<BrowserActionTestUtil> browser_actions_bar_;
 };
 
 // Test the basic functionality.
 // http://crbug.com/120770
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, DISABLED_Basic) {
 #else
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Basic) {
 #endif
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-
   // Load an extension with no browser action.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("none")));
   // This extension should not be in the model (has no browser action).
   EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions());
 
   // Load an extension with a 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));
 
 
   // Unload the extension.
   std::string id = browser_actions_bar()->GetExtensionId(0);
   UnloadExtension(id);
   EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions());
 }
 
 // Test moving various browser actions. This is not to check the logic of the
 // move (that's in the toolbar model tests), but just to check our ui.
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest,
                        MoveBrowserActions) {
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-
   // Load three extensions with browser actions.
   const Extension* extension_a =
       LoadExtension(test_data_dir_.AppendASCII("api_test")
                                   .AppendASCII("browser_action")
                                   .AppendASCII("basics"));
   ASSERT_TRUE(extension_a);
   const Extension* extension_b =
       LoadExtension(test_data_dir_.AppendASCII("api_test")
                                   .AppendASCII("browser_action")
                                   .AppendASCII("add_popup"));
@@ skipping 29 matching lines @@
   EXPECT_EQ(extension_b->id(), browser_actions_bar()->GetExtensionId(2));
 
   // Move B to middle position. Order is C B A.
   model->MoveExtensionIcon(extension_b, 1);
   EXPECT_EQ(extension_c->id(), browser_actions_bar()->GetExtensionId(0));
   EXPECT_EQ(extension_b->id(), browser_actions_bar()->GetExtensionId(1));
   EXPECT_EQ(extension_a->id(), browser_actions_bar()->GetExtensionId(2));
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) {
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-
   // 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());
   std::string idA = browser_actions_bar()->GetExtensionId(0);
 
   // Load extension B (contains browser action).
@@ skipping 69 matching lines @@
   EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(0));
 
   // Enable A. State becomes: A, B, C.
   EnableExtension(idA);
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, ForceHide) {
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-
   // 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());
   std::string idA = browser_actions_bar()->GetExtensionId(0);
 
   // Force hide this browser action.
   extensions::ExtensionActionAPI::SetBrowserActionVisibility(
       extensions::ExtensionPrefs::Get(browser()->profile()), idA, false);
   EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
 }
 
 // Test that the BrowserActionsContainer responds correctly when the underlying
 // model enters highlight mode, and that browser actions are undraggable in
 // highlight mode. (Highlight mode itself it tested more thoroughly in the
 // ExtensionToolbarModel browsertests).
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, HighlightMode) {
-  BrowserActionsContainer::disable_animations_during_testing_ = true;
-
   // Load three extensions with browser actions.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("basics")));
   std::string id_a = browser_actions_bar()->GetExtensionId(0);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("browser_action")
                                           .AppendASCII("add_popup")));
   std::string id_b = browser_actions_bar()->GetExtensionId(1);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
@@ skipping 31 matching lines @@
   action_view = container->GetBrowserActionViewAt(0);
   EXPECT_FALSE(container->CanStartDragForView(action_view, point, point));
 
   // We should go back to normal after leaving highlight mode.
   model->StopHighlighting();
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   action_view = container->GetBrowserActionViewAt(0);
   EXPECT_TRUE(container->CanStartDragForView(action_view, point, point));
 }