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

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
index 5bca72dd260f0e53aeca4ad8e55034014ff5beae..9b88f6328ac8c04b48e148c5032f40dd50ddb163 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
@@ -23,6 +23,7 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/feature_switch.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 
 namespace {
@@ -85,19 +86,11 @@ std::string VerifyToolbarOrderForBar(
 }  // namespace
 
 ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest()
-    : toolbar_model_(nullptr),
-      use_redesign_(false) {}
-
-ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest(bool use_redesign)
-    : toolbar_model_(nullptr),
-      use_redesign_(use_redesign) {}
+    : toolbar_model_(nullptr) {}
 
 ToolbarActionsBarUnitTest::~ToolbarActionsBarUnitTest() {}
 
 void ToolbarActionsBarUnitTest::SetUp() {
-  redesign_switch_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), use_redesign_));
-
   BrowserWithTestWindowTest::SetUp();
   // The toolbar typically displays extension icons, so create some extension
   // test infrastructure.
@@ -117,7 +110,7 @@ void ToolbarActionsBarUnitTest::SetUp() {
   ToolbarActionsBar::disable_animations_for_testing_ = true;
   browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
 
-  if (use_redesign_) {
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     overflow_browser_action_test_util_ =
         browser_action_test_util_->CreateOverflowBar();
   }
@@ -129,7 +122,6 @@ void ToolbarActionsBarUnitTest::TearDown() {
   browser_action_test_util_.reset();
   overflow_browser_action_test_util_.reset();
   ToolbarActionsBar::disable_animations_for_testing_ = false;
-  redesign_switch_.reset();
   material_design_state_.reset();
   BrowserWithTestWindowTest::TearDown();
 }
@@ -171,7 +163,7 @@ testing::AssertionResult ToolbarActionsBarUnitTest::VerifyToolbarOrder(
                                total_size,
                                visible_count);
   std::string overflow_bar_error;
-  if (use_redesign_) {
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     overflow_bar_error =
         VerifyToolbarOrderForBar(overflow_bar(),
                                  overflow_browser_action_test_util(),
@@ -187,11 +179,6 @@ testing::AssertionResult ToolbarActionsBarUnitTest::VerifyToolbarOrder(
           "overflow bar error:\n" << overflow_bar_error;
 }
 
-ToolbarActionsBarRedesignUnitTest::ToolbarActionsBarRedesignUnitTest()
-    : ToolbarActionsBarUnitTest(true) {}
-
-ToolbarActionsBarRedesignUnitTest::~ToolbarActionsBarRedesignUnitTest() {}
-
 // Note: First argument is optional and intentionally left blank.
 // (it's a prefix for the generated test cases)
 INSTANTIATE_TEST_CASE_P(
@@ -409,17 +396,8 @@ TEST_P(ToolbarActionsBarUnitTest, TestHighlightMode) {
   }
 }
 
-// Note: First argument is optional and intentionally left blank.
-// (it's a prefix for the generated test cases)
-INSTANTIATE_TEST_CASE_P(
-    ,
-    ToolbarActionsBarRedesignUnitTest,
-    testing::Values(ui::MaterialDesignController::NON_MATERIAL,
-                    ui::MaterialDesignController::MATERIAL_NORMAL,
-                    ui::MaterialDesignController::MATERIAL_HYBRID));
-
 // Test the bounds calculation for different indices.
-TEST_P(ToolbarActionsBarRedesignUnitTest, TestActionFrameBounds) {
+TEST_P(ToolbarActionsBarUnitTest, TestActionFrameBounds) {
   const int kIconWidth = ToolbarActionsBar::IconWidth(false);
   const int kIconHeight = ToolbarActionsBar::IconHeight();
   const int kIconWidthWithPadding = ToolbarActionsBar::IconWidth(true);
@@ -484,7 +462,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, TestActionFrameBounds) {
             overflow_bar()->GetFrameForIndex(6));
 }
 
-TEST_P(ToolbarActionsBarRedesignUnitTest, TestStartAndEndIndexes) {
+TEST_P(ToolbarActionsBarUnitTest, TestStartAndEndIndexes) {
   const int kIconWidthWithPadding = ToolbarActionsBar::IconWidth(true);
   const int kIconSpacing = GetLayoutConstant(TOOLBAR_STANDARD_SPACING);
 
@@ -539,7 +517,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, TestStartAndEndIndexes) {
 }
 
 // Tests the logic for determining if the container needs an overflow menu item.
-TEST_P(ToolbarActionsBarRedesignUnitTest, TestNeedsOverflow) {
+TEST_P(ToolbarActionsBarUnitTest, TestNeedsOverflow) {
   CreateAndAddExtension(
       "extension 1",
       extensions::extension_action_test_util::BROWSER_ACTION);