[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/extensions/location_bar_controller_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 22 matching lines @@
 #endif
 
 namespace extensions {
 namespace {
 
 class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
  protected:
   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
   test_user_manager_.reset(new chromeos::ScopedTestUserManager());
 #endif
     TabHelper::CreateForWebContents(web_contents());
     // Create an ExtensionService so the LocationBarController can find its
     // extensions.
     base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     Profile* profile =
@@ skipping 39 matching lines @@
  private:
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
   // 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.
 TEST_F(LocationBarControllerUnitTest, LocationBarDisplaysPageActions) {
   // Load up two extensions, one with a page action and one without.
   const Extension* page_action = AddExtension(true, "page_actions");
   const Extension* no_action = AddExtension(false, "no_actions");
 
   TabHelper* tab_helper = TabHelper::FromWebContents(web_contents());
   ASSERT_TRUE(tab_helper);
@@ skipping 79 matching lines @@
   NavigateAndCommit(GURL("http://www.yahoo.com"));
 
   EXPECT_EQ("Hello", page_action.GetTitle(tab_id()));
   EXPECT_EQ(GURL(), page_action.GetPopupUrl(tab_id()));
   EXPECT_FALSE(
       extension_action_api->PageActionWantsToRun(extension, web_contents()));
 }
 
 }  // namespace
 }  // namespace extensions