[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/extensions/extension_installed_bubble.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/value_builder.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 #include "ui/gfx/codec/png_codec.h"
 
 using extensions::Extension;
 using extensions::DictionaryBuilder;
 
 class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest {
@@ skipping 239 matching lines @@
   EXPECT_GT(NSMinY(iconFrame), NSMinY(syncPromoFrame));
   EXPECT_GT(NSMinY(iconFrame), 0);
   EXPECT_EQ(NSMinY(syncPromoFrame), 0);
 
   [controller close];
 }
 
 // Test the layout of a bubble for an unpacked extension (which is not syncable)
 // and verify that the page action preview is enabled.
 TEST_F(ExtensionInstalledBubbleControllerTest, BubbleLayoutPageActionUnpacked) {
+  // Tests legacy behavior.
+  extensions::FeatureSwitch::ScopedOverride extension_action_override(
+      extensions::FeatureSwitch::extension_action_redesign(), false);
   // Page actions need a web contents (for the location bar to not break).
   AddWebContents();
 
   LocationBarTesting* locationBar =
       browser()->window()->GetLocationBar()->GetLocationBarForTesting();
   // To start, there should be no visible page actions.
   EXPECT_EQ(0, locationBar->PageActionVisibleCount());
 
   CreateExtension(PAGE_ACTION, true, extensions::Manifest::UNPACKED);
   ExtensionInstalledBubbleController* controller = CreateController();
@@ skipping 69 matching lines @@
   // Make sure there is always enough room for the icon and margin.
   int minHeight = extension_installed_bubble::kIconSize +
     (2 * extension_installed_bubble::kOuterVerticalMargin);
   EXPECT_GT(height, minHeight);
 
   // Make sure the "show me" link is visible.
   EXPECT_FALSE([[controller appInstalledShortcutLink] isHidden]);
 
   [controller close];
 }