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

chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_action_runner.h"
 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/user_script.h"
 #include "ui/base/l10n/l10n_util.h"
 
+class ToolbarActionsBarLegacyUnitTest : public ToolbarActionsBarUnitTest {
+ public:
+  ToolbarActionsBarLegacyUnitTest()
+      : extension_action_redesign_override_(
+            extensions::FeatureSwitch::extension_action_redesign(), true) {}
+  ~ToolbarActionsBarLegacyUnitTest() override {}
+
+ private:
+  extensions::FeatureSwitch::ScopedOverride extension_action_redesign_override_;
+
+  DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarLegacyUnitTest);
+};
+
 // Tests the icon appearance of extension actions without the toolbar redesign.
 // In this case, the action should never be grayscaled or decorated to indicate
 // whether or not it wants to run.
-TEST_P(ToolbarActionsBarUnitTest, ExtensionActionNormalAppearance) {
+TEST_P(ToolbarActionsBarLegacyUnitTest, ExtensionActionNormalAppearance) {
   CreateAndAddExtension("extension",
                         extensions::extension_action_test_util::BROWSER_ACTION);
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
 
   AddTab(browser(), GURL("chrome://newtab"));
 
   gfx::Size size(ToolbarActionsBar::IconWidth(false),
                  ToolbarActionsBar::IconHeight());
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 20 matching lines @@
   SetActionWantsToRunOnTab(action->extension_action(), web_contents, true);
   image_source = action->GetIconImageSourceForTesting(web_contents, size);
   EXPECT_FALSE(image_source->grayscale());
   EXPECT_FALSE(image_source->paint_page_action_decoration());
   EXPECT_FALSE(image_source->paint_blocked_actions_decoration());
 }
 
 // Tests the icon appearance of extension actions with the toolbar redesign.
 // Extensions that don't want to run should have their icons grayscaled.
 // Overflowed extensions that want to run should have an additional decoration.
-TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionWantsToRunAppearance) {
+TEST_P(ToolbarActionsBarUnitTest, ExtensionActionWantsToRunAppearance) {
   CreateAndAddExtension("extension",
                         extensions::extension_action_test_util::PAGE_ACTION);
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
   EXPECT_EQ(0u, overflow_bar()->GetIconCount());
 
   AddTab(browser(), GURL("chrome://newtab"));
 
   gfx::Size size(ToolbarActionsBar::IconWidth(false),
                  ToolbarActionsBar::IconHeight());
   content::WebContents* web_contents =
@@ skipping 24 matching lines @@
   EXPECT_TRUE(image_source->paint_page_action_decoration());
   EXPECT_FALSE(image_source->paint_blocked_actions_decoration());
 
   SetActionWantsToRunOnTab(action->extension_action(), web_contents, false);
   image_source = action->GetIconImageSourceForTesting(web_contents, size);
   EXPECT_TRUE(image_source->grayscale());
   EXPECT_FALSE(image_source->paint_page_action_decoration());
   EXPECT_FALSE(image_source->paint_blocked_actions_decoration());
 }
 
-TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionBlockedActions) {
+TEST_P(ToolbarActionsBarUnitTest, ExtensionActionBlockedActions) {
   scoped_refptr<const extensions::Extension> browser_action_ext =
       CreateAndAddExtension(
           "browser action",
           extensions::extension_action_test_util::BROWSER_ACTION);
   ASSERT_EQ(1u, toolbar_actions_bar()->GetIconCount());
   AddTab(browser(), GURL("https://www.google.com/"));
 
   ExtensionActionViewController* browser_action =
       static_cast<ExtensionActionViewController*>(
           toolbar_actions_bar()->GetActions()[0]);
@@ skipping 72 matching lines @@
                            web_contents, false);
   toolbar_model()->SetVisibleIconCount(2u);
 
   action_runner->RunBlockedActions(page_action_ext.get());
   image_source = page_action->GetIconImageSourceForTesting(web_contents, kSize);
   EXPECT_TRUE(image_source->grayscale());
   EXPECT_FALSE(image_source->paint_page_action_decoration());
   EXPECT_FALSE(image_source->paint_blocked_actions_decoration());
 }
 
-TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionContextMenu) {
+TEST_P(ToolbarActionsBarUnitTest, ExtensionActionContextMenu) {
   CreateAndAddExtension("extension",
                         extensions::extension_action_test_util::BROWSER_ACTION);
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
 
   // Check that the context menu has the proper string for the action's position
   // (in the main toolbar, in the overflow container, or temporarily popped
   // out).
   auto check_visibility_string = [](ToolbarActionViewController* action,
                                     int expected_visibility_string) {
     ui::SimpleMenuModel* context_menu =
@@ skipping 13 matching lines @@
   check_visibility_string(overflow_bar()->GetActions()[0],
                           IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR);
   base::RunLoop run_loop;
   toolbar_actions_bar()->PopOutAction(toolbar_actions_bar()->GetActions()[0],
                                       false,
                                       run_loop.QuitClosure());
   run_loop.Run();
   check_visibility_string(toolbar_actions_bar()->GetActions()[0],
                           IDS_EXTENSIONS_KEEP_BUTTON_IN_TOOLBAR);
 }