[Extensions] Default-enable the toolbar redesign on trunk

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 388 matching lines @@
 void ToolbarActionsModelUnitTest::SetMockActionsFactory(
     MockComponentToolbarActionsFactory* factory) {
   mock_actions_factory_.reset(factory);
 }
 
 // A basic test for component actions and extensions with browser actions
 // showing up in the toolbar.
 TEST_F(ToolbarActionsModelUnitTest, BasicToolbarActionsModelTest) {
   Init();
 
-  // Load an extension with no browser action.
-  scoped_refptr<const extensions::Extension> extension1 =
-      extensions::extension_action_test_util::CreateActionExtension(
-          "no_action", extensions::extension_action_test_util::NO_ACTION);
-  ASSERT_TRUE(AddExtension(extension1));
-
-  // This extension should not be in the model (has no browser action).
-  EXPECT_EQ(0u, observer()->inserted_count());
-  EXPECT_EQ(0u, num_toolbar_items());
-  EXPECT_EQ(std::string(), GetActionIdAtIndex(0u));
-
   // Load an extension with a browser action.
-  scoped_refptr<const extensions::Extension> extension2 =
+  scoped_refptr<const extensions::Extension> extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "browser_action",
           extensions::extension_action_test_util::BROWSER_ACTION);
-  ASSERT_TRUE(AddExtension(extension2));
+  ASSERT_TRUE(AddExtension(extension));
 
   // We should now find our extension in the model.
   EXPECT_EQ(1u, observer()->inserted_count());
   EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(extension2->id(), GetActionIdAtIndex(0u));
+  EXPECT_EQ(extension->id(), GetActionIdAtIndex(0u));
 
   // Should be a no-op, but still fires the events.
-  toolbar_model()->MoveActionIcon(extension2->id(), 0);
+  toolbar_model()->MoveActionIcon(extension->id(), 0);
   EXPECT_EQ(1u, observer()->moved_count());
   EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(extension2->id(), GetActionIdAtIndex(0u));
+  EXPECT_EQ(extension->id(), GetActionIdAtIndex(0u));
 
   // Remove the extension and verify.
-  ASSERT_TRUE(RemoveExtension(extension2));
+  ASSERT_TRUE(RemoveExtension(extension));
   EXPECT_EQ(1u, observer()->removed_count());
   EXPECT_EQ(0u, num_toolbar_items());
   EXPECT_EQ(std::string(), GetActionIdAtIndex(0u));
 }
 
 // Test various different reorderings, removals, and reinsertions.
 TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarReorderAndReinsert) {
   Init();
 
   // Add the three browser action extensions.
@@ skipping 440 matching lines @@
   EXPECT_TRUE(toolbar_model()->all_icons_visible());
   EXPECT_EQ(num_toolbar_items(), toolbar_model()->visible_icon_count());
   toolbar_model()->OnActionToolbarPrefChange();
   // Should still be at max size.
   EXPECT_TRUE(toolbar_model()->all_icons_visible());
   EXPECT_EQ(num_toolbar_items(), toolbar_model()->visible_icon_count());
 }
 
 // Test that, in the absence of the extension-action-redesign switch, the
 // model only contains extensions with browser actions and component actions.
-TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesNoSwitch) {
+TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesDisabledSwitch) {
+  extensions::FeatureSwitch::ScopedOverride enable_redesign(
+      extensions::FeatureSwitch::extension_action_redesign(), false);
   Init();
   ASSERT_TRUE(AddActionExtensions());
 
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action()->id(), GetActionIdAtIndex(0u));
 }
 
 // Test that, with the extension-action-redesign switch, the model contains
 // all types of extensions, except those which should not be displayed on the
 // toolbar (like component extensions).
-TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesSwitch) {
+TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesEnabledSwitch) {
   extensions::FeatureSwitch::ScopedOverride enable_redesign(
       extensions::FeatureSwitch::extension_action_redesign(), true);
   Init();
 
   ASSERT_TRUE(AddActionExtensions());
 
   // With the switch on, extensions with page actions and no action should also
   // be displayed in the toolbar.
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action()->id(), GetActionIdAtIndex(0u));
   EXPECT_EQ(page_action()->id(), GetActionIdAtIndex(1u));
   EXPECT_EQ(no_action()->id(), GetActionIdAtIndex(2u));
 }
 
 // Test that hiding actions on the toolbar results in their removal from the
 // model when the redesign switch is not enabled.
 TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarActionsVisibilityNoSwitch) {
+  extensions::FeatureSwitch::ScopedOverride enable_redesign(
+      extensions::FeatureSwitch::extension_action_redesign(), false);
   Init();
 
   extensions::ExtensionActionAPI* action_api =
       extensions::ExtensionActionAPI::Get(profile());
 
   ASSERT_TRUE(AddBrowserActionExtensions());
   // Sanity check: Order should start as A , B, C.
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_a()->id(), GetActionIdAtIndex(0u));
   EXPECT_EQ(browser_action_b()->id(), GetActionIdAtIndex(1u));
@@ skipping 553 matching lines @@
 }
 
 TEST_F(ToolbarActionsModelUnitTest,
        MigrationToExtensionWithoutExtensionActionRedesign) {
   InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE);
 
   // Initialization re-enables the extension.
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u));
 }