[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h

 // Copyright 2014 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_BROWSER_ACTIONS_BAR_BROWSERTEST_H_
 #define CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
-#include "extensions/common/feature_switch.h"
 
 namespace extensions {
 class Extension;
 }
 
 class BrowserActionTestUtil;
 class ToolbarActionsModel;
 
 // A platform-independent browser test class for the browser actions bar.
 class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
@@ skipping 18 matching lines @@
   const extensions::Extension* extension_a() const {
     return extension_a_.get();
   }
   const extensions::Extension* extension_b() const {
     return extension_b_.get();
   }
   const extensions::Extension* extension_c() const {
     return extension_c_.get();
   }
 
- protected:
-  // Enable or disable the feature redesign switch.
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> override_redesign_;
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride>
-      override_media_router_;
-
  private:
   std::unique_ptr<BrowserActionTestUtil> browser_actions_bar_;
 
   // The associated toolbar model, weak.
   ToolbarActionsModel* toolbar_model_;
 
   // Extensions with browser actions used for testing.
   scoped_refptr<const extensions::Extension> extension_a_;
   scoped_refptr<const extensions::Extension> extension_b_;
   scoped_refptr<const extensions::Extension> extension_c_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest);
 };
 
-// A test with the extension-action-redesign switch disabled.
-class BrowserActionsBarLegacyBrowserTest
-    : public BrowserActionsBarBrowserTest {
- protected:
-  BrowserActionsBarLegacyBrowserTest();
-  ~BrowserActionsBarLegacyBrowserTest() override;
-
-  void SetUpCommandLine(base::CommandLine* command_line) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarLegacyBrowserTest);
-};
-
 #endif  // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_