[Extensions UI] Remove override of toolbar redesign in many tests

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.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/browser_actions_bar_browsertest.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 59 matching lines @@
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   ToolbarActionsBar::disable_animations_for_testing_ = true;
   // We need to disable Media Router since having Media Router enabled will
   // result in auto-enabling the redesign and breaking the test.
   override_media_router_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::media_router(), false));
   // These tests are deliberately testing behavior without the redesign.
   // Forcefully disable it.
   override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), false));
+      extensions::FeatureSwitch::extension_action_redesign(), true));
 }
 
 void BrowserActionsBarBrowserTest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
   browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
   toolbar_model_ = ToolbarActionsModel::Get(profile());
 }
 
 void BrowserActionsBarBrowserTest::TearDownOnMainThread() {
   ToolbarActionsBar::disable_animations_for_testing_ = false;
@@ skipping 17 matching lines @@
     EXPECT_TRUE(registry->enabled_extensions().GetByID(extensions[i]->id())) <<
         extensions[i]->name();
     EXPECT_EQ(static_cast<int>(i + 1),
               browser_actions_bar_->NumberOfBrowserActions());
     EXPECT_TRUE(browser_actions_bar_->HasIcon(i));
     EXPECT_EQ(static_cast<int>(i + 1),
               browser_actions_bar()->VisibleBrowserActions());
   }
 }
 
-// BrowserActionsBarRedesignBrowserTest:
+// BrowserActionsBarLegacyBrowserTest:
 
-BrowserActionsBarRedesignBrowserTest::BrowserActionsBarRedesignBrowserTest() {
+BrowserActionsBarLegacyBrowserTest::BrowserActionsBarLegacyBrowserTest() {
 }
 
-BrowserActionsBarRedesignBrowserTest::~BrowserActionsBarRedesignBrowserTest() {
+BrowserActionsBarLegacyBrowserTest::~BrowserActionsBarLegacyBrowserTest() {
 }
 
-void BrowserActionsBarRedesignBrowserTest::SetUpCommandLine(
+void BrowserActionsBarLegacyBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);
   // Override to force the redesign. Completely clear the previous override
   // first, since doing so resets the value of the switch.
   override_redesign_.reset();
   override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), true));
+      extensions::FeatureSwitch::extension_action_redesign(), false));
 }
 
 // Test the basic functionality.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarLegacyBrowserTest, Basic) {
   // Load an extension with no browser action.
   extension_service()->AddExtension(CreateExtension("alpha", false).get());
   // 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.
   extension_service()->AddExtension(CreateExtension("beta", true).get());
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_TRUE(browser_actions_bar()->HasIcon(0));
 
@@ skipping 30 matching lines @@
 
   // Move B to middle position. Order is C B A.
   toolbar_model()->MoveActionIcon(extension_b()->id(), 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));
 }
 
 // Test that explicitly hiding an extension action results in it disappearing
 // from the browser actions bar.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, ForceHide) {
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarLegacyBrowserTest, ForceHide) {
   LoadExtensions();
 
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(extension_a()->id(), browser_actions_bar()->GetExtensionId(0));
   // Force hide one of the extensions' browser action.
   extensions::ExtensionActionAPI::Get(browser()->profile())->
       SetBrowserActionVisibility(extension_a()->id(), false);
   // The browser action for Extension A should be removed.
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(extension_b()->id(), browser_actions_bar()->GetExtensionId(0));
@@ skipping 89 matching lines @@
   // overflow.
   EnableExtension(extension_c()->id());
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(extension_a()->id(), browser_actions_bar()->GetExtensionId(0));
   EXPECT_EQ(extension_b()->id(), browser_actions_bar()->GetExtensionId(1));
   EXPECT_TRUE(toolbar_actions_bar->NeedsOverflow());
 }
 
 // Test that, with the toolbar action redesign, actions that want to run have
 // the proper appearance.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
                        TestUiForActionsWantToRun) {
   LoadExtensions();
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
 
   // Load an extension with a page action.
   scoped_refptr<const extensions::Extension> page_action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "page action", extensions::extension_action_test_util::PAGE_ACTION);
   extension_service()->AddExtension(page_action_extension.get());
 
@@ skipping 96 matching lines @@
         extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED,
         content::NotificationService::AllSources());
     browser_actions_bar()->Press(1);
     observer.Wait();
     EXPECT_FALSE(browser_actions_bar()->HasPopup());
     EXPECT_FALSE(first_controller->is_showing_popup());
     EXPECT_FALSE(second_controller->is_showing_popup());
   }
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
                        OverflowedBrowserActionPopupTest) {
   std::unique_ptr<BrowserActionTestUtil> overflow_bar =
       browser_actions_bar()->CreateOverflowBar();
 
   // Load up two extensions that have browser action popups.
   base::FilePath data_dir =
       test_data_dir_.AppendASCII("api_test").AppendASCII("browser_action");
   const extensions::Extension* first_extension =
       LoadExtension(data_dir.AppendASCII("open_popup"));
   ASSERT_TRUE(first_extension);
@@ skipping 66 matching lines @@
   EXPECT_EQ(2, overflow_bar->VisibleBrowserActions());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(first_controller_main->GetId(),
             browser_actions_bar()->GetExtensionId(0));
   EXPECT_EQ(second_controller_main->GetId(),
             browser_actions_bar()->GetExtensionId(1));
 }
 
 // Test removing an extension that has an popup showing.
 // Regression test for crbug.com/599467.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
                        OverflowedBrowserActionPopupTestRemoval) {
   std::unique_ptr<BrowserActionTestUtil> overflow_bar =
       browser_actions_bar()->CreateOverflowBar();
 
   // Install an extension and shrink the visible count to zero so the extension
   // is overflowed.
   base::FilePath data_dir =
       test_data_dir_.AppendASCII("api_test").AppendASCII("browser_action");
   const extensions::Extension* extension =
       LoadExtension(data_dir.AppendASCII("open_popup"));
@@ skipping 19 matching lines @@
         extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
     observer.Wait();
   }
 
   EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(0, overflow_bar->VisibleBrowserActions());
   EXPECT_EQ(0u, toolbar_model()->toolbar_items().size());
 }
 
 // Test that page action popups work with the toolbar redesign.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
                        PageActionPopupsTest) {
   ExtensionTestMessageListener listener("ready", false);
   const extensions::Extension* page_action_extension =
       LoadExtension(test_data_dir_.AppendASCII("trigger_actions").
                         AppendASCII("page_action_popup"));
   ASSERT_TRUE(page_action_extension);
   listener.WaitUntilSatisfied();
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(page_action_extension->id(),
             browser_actions_bar()->GetExtensionId(0));
   browser_actions_bar()->Press(0);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(browser_actions_bar()->HasPopup());
   // Cleanup the popup (to avoid having windows open at tear down).
   browser_actions_bar()->HidePopup();
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_FALSE(browser_actions_bar()->HasPopup());
 }
 
 // Test removing an action while it is popped out.
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
-                       RemovePoppedOutAction) {
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, RemovePoppedOutAction) {
   // First, load up three separate extensions and reduce the visible count to
   // one (so that two are in the overflow).
   scoped_refptr<const extensions::Extension> extension1 =
       extensions::extension_action_test_util::CreateActionExtension(
           "extension1", extensions::extension_action_test_util::BROWSER_ACTION);
   extension_service()->AddExtension(extension1.get());
   scoped_refptr<const extensions::Extension> extension2 =
       extensions::extension_action_test_util::CreateActionExtension(
           "extension2", extensions::extension_action_test_util::BROWSER_ACTION);
   extension_service()->AddExtension(extension2.get());
@@ skipping 59 matching lines @@
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
   ASSERT_TRUE(toolbar_actions_bar->popped_out_action());
   EXPECT_EQ(extension3->id(),
             toolbar_actions_bar->popped_out_action()->GetId());
   extension_service()->UnloadExtension(
       extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
 }