[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/extensions/location_bar_controller_unittest.cc

Index: chrome/browser/extensions/location_bar_controller_unittest.cc
diff --git a/chrome/browser/extensions/location_bar_controller_unittest.cc b/chrome/browser/extensions/location_bar_controller_unittest.cc
index d34f8213d36c28b2bcedc8b11d8afda6a19164b0..09c12d282230f8e06d718807cf751d06c60ff3d9 100644
--- a/chrome/browser/extensions/location_bar_controller_unittest.cc
+++ b/chrome/browser/extensions/location_bar_controller_unittest.cc
@@ -40,6 +40,8 @@ class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
   void SetUp() override {
     active_script_override_.reset(new FeatureSwitch::ScopedOverride(
         FeatureSwitch::scripts_require_action(), true));
+    extension_action_override_.reset(new FeatureSwitch::ScopedOverride(
+        FeatureSwitch::extension_action_redesign(), false));
 
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined OS_CHROMEOS
@@ -99,6 +101,9 @@ class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
   // Since we also test that we show page actions for pending script requests,
   // we need to enable that feature.
   scoped_ptr<FeatureSwitch::ScopedOverride> active_script_override_;
+
+  // This tests legacy page actions.
+  scoped_ptr<FeatureSwitch::ScopedOverride> extension_action_override_;
 };
 
 // Test that the location bar gets the proper current actions.