[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.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/auto_reset.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 52 matching lines @@
   void ClickActionButton(Browser* browser) override;
   void ClickDismissButton(Browser* browser) override;
 
   // Whether to ignore requests from ExtensionMessageBubbleBrowserTest to
   // CloseBubble().
   bool block_close_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleViewBrowserTest);
 };
 
-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));
-  }
-};
-
 void ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionMessageBubbleBrowserTest::SetUpCommandLine(command_line);
   // MD is required on Mac to get a Views bubble. On other platforms, it should
   // not affect the behavior of the bubble (just the appearance), so enable for
   // all platforms.
   command_line->AppendSwitch(switches::kExtendMdToSecondaryUi);
 }
 
 void ExtensionMessageBubbleViewBrowserTest::ShowDialog(
@@ skipping 62 matching lines @@
     Browser* browser) {
   ToolbarActionsBarBubbleViews* bubble = GetViewsBubbleForBrowser(browser);
   bubble->GetDialogClientView()->CancelWindow();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        ExtensionBubbleAnchoredToExtensionAction) {
   TestBubbleAnchoredToExtensionAction();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestLegacy,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        ExtensionBubbleAnchoredToAppMenu) {
   TestBubbleAnchoredToAppMenu();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTestLegacy,
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        ExtensionBubbleAnchoredToAppMenuWithOtherAction) {
   TestBubbleAnchoredToAppMenuWithOtherAction();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        PRE_ExtensionBubbleShowsOnStartup) {
   PreBubbleShowsOnStartup();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
@@ skipping 83 matching lines @@
   TestClickingDismissButton();
 }
 
 // BrowserDialogTest for the warning bubble that appears at startup when there
 // are extensions installed in developer mode. Can be invoked interactively with
 // --gtest_filter=BrowserDialogTest.Invoke.
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        InvokeDialog_devmode_warning) {
   RunDialog();
 }