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

Some extensions tests had the toolbar redesign disabled by a custom override.
Some of these are testing legacy behavior, but many were just never changed
over. Update
many to remove the custom override, enabling the redesign.

In order to stay targeted, this CL doesn't update behavior expectations
for any tests. That will be done in a followup.

BUG=None

Review-Url: https://codereview.chromium.org/2311533002
Cr-Commit-Position: refs/heads/master@{#417068}

chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm

@@ -105,12 +105,14 @@ class ExtensionMessageBubbleBrowserTestMac
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleBrowserTestMac);
 };
 
-class ExtensionMessageBubbleBrowserTestRedesignMac
+class ExtensionMessageBubbleBrowserTestLegacyMac
     : public ExtensionMessageBubbleBrowserTestMac {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionMessageBubbleBrowserTestMac::SetUpCommandLine(command_line);
     override_redesign_.reset();
+    override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
+        extensions::FeatureSwitch::extension_action_redesign(), false));
   }
 };
 
@@ -178,12 +180,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
   TestBubbleAnchoredToExtensionAction();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestLegacyMac,
                        ExtensionBubbleAnchoredToAppMenu) {
   TestBubbleAnchoredToAppMenu();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestLegacyMac,
                        ExtensionBubbleAnchoredToAppMenuWithOtherAction) {
   TestBubbleAnchoredToAppMenuWithOtherAction();
 }
@@ -228,12 +230,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
   TestClickingDismissButton();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestRedesignMac,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        TestControlledHomeMessageBubble) {
   TestControlledHomeBubbleShown();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestRedesignMac,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        TestControlledSearchMessageBubble) {
   TestControlledSearchBubbleShown();
 }

chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

@@ -13,13 +13,27 @@
 #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());
@@ -60,7 +74,7 @@ TEST_P(ToolbarActionsBarUnitTest, ExtensionActionNormalAppearance) {
 // 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());
@@ -105,7 +119,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionWantsToRunAppearance) {
   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",
@@ -198,7 +212,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionBlockedActions) {
   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());

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

@@ -77,7 +77,7 @@ void BrowserActionsBarBrowserTest::SetUpCommandLine(
   // 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() {
@@ -115,26 +115,26 @@ void BrowserActionsBarBrowserTest::LoadExtensions() {
   }
 }
 
-// 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).
@@ -185,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, MoveBrowserActions) {
 
 // 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());
@@ -295,7 +295,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, Visibility) {
 
 // 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());
@@ -412,7 +412,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
   }
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
+IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
                        OverflowedBrowserActionPopupTest) {
   std::unique_ptr<BrowserActionTestUtil> overflow_bar =
       browser_actions_bar()->CreateOverflowBar();
@@ -499,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
 
 // 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();
@@ -539,7 +539,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
 }
 
 // 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 =
@@ -560,8 +560,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
 }
 
 // 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 =

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h

@@ -69,17 +69,17 @@ class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest);
 };
 
-// A test with the extension-action-redesign switch enabled.
-class BrowserActionsBarRedesignBrowserTest
+// A test with the extension-action-redesign switch disabled.
+class BrowserActionsBarLegacyBrowserTest
     : public BrowserActionsBarBrowserTest {
  protected:
-  BrowserActionsBarRedesignBrowserTest();
-  ~BrowserActionsBarRedesignBrowserTest() override;
+  BrowserActionsBarLegacyBrowserTest();
+  ~BrowserActionsBarLegacyBrowserTest() override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarRedesignBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarLegacyBrowserTest);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_

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);

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h

@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
-#include "extensions/common/feature_switch.h"
 #include "ui/base/material_design/material_design_controller.h"
 
 class ExtensionAction;
@@ -40,9 +39,6 @@ class ToolbarActionsBarUnitTest :
   ~ToolbarActionsBarUnitTest() override;
 
  protected:
-  // A constructor to allow subclasses to override the redesign value.
-  explicit ToolbarActionsBarUnitTest(bool use_redesign);
-
   void SetUp() override;
   void TearDown() override;
 
@@ -97,28 +93,13 @@ class ToolbarActionsBarUnitTest :
   // ToolbarActionsBar.
   std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_;
 
-  // The overflow container's BrowserActionTestUtil (only non-null if
-  // |use_redesign| is true).
+  // The overflow container's BrowserActionTestUtil.
   std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_;
 
-  // True if the extension action redesign switch should be enabled.
-  bool use_redesign_;
-
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_;
-
   std::unique_ptr<ui::test::MaterialDesignControllerTestAPI>
       material_design_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest);
 };
 
-class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest {
- public:
-  ToolbarActionsBarRedesignUnitTest();
-  ~ToolbarActionsBarRedesignUnitTest() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest);
-};
-
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_

chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc

@@ -72,12 +72,14 @@ class ExtensionMessageBubbleViewBrowserTest
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest);
 };
 
-class ExtensionMessageBubbleViewBrowserTestRedesign
+class ExtensionMessageBubbleViewBrowserTestLegacy
     : public ExtensionMessageBubbleViewBrowserTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(command_line);
     override_redesign_.reset();
+    override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
+        extensions::FeatureSwitch::extension_action_redesign(), false));
   }
 };
 
@@ -141,12 +143,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
   TestBubbleAnchoredToExtensionAction();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestLegacy,
                        ExtensionBubbleAnchoredToAppMenu) {
   TestBubbleAnchoredToAppMenu();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestLegacy,
                        ExtensionBubbleAnchoredToAppMenuWithOtherAction) {
   TestBubbleAnchoredToAppMenuWithOtherAction();
 }
@@ -174,17 +176,17 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
 // Tests for the extension bubble and settings overrides. These bubbles are
 // currently only shown on Windows.
 #if defined(OS_WIN)
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledNewTabPageMessageBubble) {
   TestControlledNewTabPageBubbleShown();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledHomeMessageBubble) {
   TestControlledHomeBubbleShown();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestRedesign,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledSearchMessageBubble) {
   TestControlledSearchBubbleShown();
 }

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

@@ -248,7 +248,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, HighlightMode) {
 
 // Test the behavior of the overflow container for Extension Actions.
 class BrowserActionsContainerOverflowTest
-    : public BrowserActionsBarRedesignBrowserTest {
+    : public BrowserActionsBarBrowserTest {
  public:
   BrowserActionsContainerOverflowTest() : main_bar_(nullptr),
                                           overflow_bar_(nullptr) {

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

@@ -139,9 +139,6 @@ class ToolbarActionViewInteractiveUITest : public ExtensionBrowserTest {
   void TearDownOnMainThread() override;
 
  private:
-  // Override the extensions-action-redesign switch.
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> feature_override_;
-
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionViewInteractiveUITest);
 };
 
@@ -151,10 +148,6 @@ ToolbarActionViewInteractiveUITest::~ToolbarActionViewInteractiveUITest() {}
 void ToolbarActionViewInteractiveUITest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
-  // We do this before the rest of the setup because it can affect how the views
-  // are constructed.
-  feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::extension_action_redesign(), true));
   ToolbarActionsBar::disable_animations_for_testing_ = true;
 }