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

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #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;
 class ToolbarActionsBar;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 }
 
 // A cross-platform unit test for the ToolbarActionsBar that uses the
 // TestToolbarActionsBarHelper to create the platform-specific containers.
 // TODO(devlin): Since this *does* use the real platform containers, in theory,
 // we can move all the BrowserActionsBarBrowserTests to be unittests. See about
 // doing this.
 class ToolbarActionsBarUnitTest :
     public BrowserWithTestWindowTest,
     public testing::WithParamInterface<ui::MaterialDesignController::Mode> {
  public:
   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;
 
   // Activates the tab at the given |index| in the tab strip model.
   void ActivateTab(int index);
 
   // Set whether or not the given |action| wants to run on the |web_contents|.
   void SetActionWantsToRunOnTab(ExtensionAction* action,
                                 content::WebContents* web_contents,
                                 bool wants_to_run);
@@ skipping 34 matching lines @@
   }
 
  private:
   // The associated ToolbarActionsModel (owned by the keyed service setup).
   ToolbarActionsModel* toolbar_model_;
 
   // A BrowserActionTestUtil object constructed with the associated
   // 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_