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

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

 // 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/macros.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
@@ skipping 87 matching lines @@
   void CheckBubbleNative(Browser* browser, AnchorPosition anchor) override;
   void CloseBubbleNative(Browser* browser) override;
   void CheckBubbleIsNotPresentNative(Browser* browser) override;
   void ClickLearnMoreButton(Browser* browser) override;
   void ClickActionButton(Browser* browser) override;
   void ClickDismissButton(Browser* browser) override;
 
   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));
   }
 };
 
 void ExtensionMessageBubbleBrowserTestMac::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionMessageBubbleBrowserTest::SetUpCommandLine(command_line);
   [ToolbarActionsBarBubbleMac setAnimationEnabledForTesting:NO];
 }
 
 void ExtensionMessageBubbleBrowserTestMac::CheckBubbleNative(
@@ skipping 47 matching lines @@
     Browser* browser) {
   ToolbarActionsBarBubbleMac* bubble = GetBubbleForBrowser(browser);
   ClickInView([bubble dismissButton]);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        ExtensionBubbleAnchoredToExtensionAction) {
   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();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        PRE_ExtensionBubbleShowsOnStartup) {
   PreBubbleShowsOnStartup();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
@@ skipping 24 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        TestClickingActionButton) {
   TestClickingActionButton();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac,
                        TestClickingDismissButton) {
   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();
 }