[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/extensions/api/declarative_content/content_action_unittest.cc

Index: chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
index a61a3016d581c3424a2131f5444aca1de844ecd8..3484ec3dd7f8a11fa2e42c64b8765ff5db1a5675 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -21,6 +21,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/value_builder.h"
 #include "ipc/ipc_message_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -98,6 +99,9 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
 }
 
 TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) {
+  // Tests legacy behavior.
+  FeatureSwitch::ScopedOverride action_redesign_override(
+      FeatureSwitch::extension_action_redesign(), false);
   TestExtensionEnvironment env;
 
   const Extension* extension = env.MakeExtension(base::DictionaryValue());