Index: chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc |
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc |
index 158a2eb84ec8acd4dbafd46db328283c9d375384..6fd46096126323f98bb9140e615081e402ecd5e3 100644 |
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc |
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc |
@@ -43,7 +43,6 @@ |
#include "extensions/browser/uninstall_reason.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/extension_builder.h" |
-#include "extensions/common/feature_switch.h" |
#include "extensions/common/manifest.h" |
#include "extensions/common/value_builder.h" |
@@ -836,24 +835,10 @@ TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarSizeAfterPrefChange) { |
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, 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, TestToolbarExtensionTypesEnabledSwitch) { |
- extensions::FeatureSwitch::ScopedOverride enable_redesign( |
- extensions::FeatureSwitch::extension_action_redesign(), true); |
Init(); |
ASSERT_TRUE(AddActionExtensions()); |
@@ -904,48 +889,6 @@ TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesEnabledSwitch) { |
EXPECT_TRUE(ModelHasActionForId(internal_extension_no_action->id())); |
} |
-// 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)); |
- EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(2u)); |
- |
- // By default, all actions should be visible. |
- EXPECT_TRUE(action_api->GetBrowserActionVisibility(browser_action_a()->id())); |
- EXPECT_TRUE(action_api->GetBrowserActionVisibility(browser_action_b()->id())); |
- EXPECT_TRUE(action_api->GetBrowserActionVisibility(browser_action_c()->id())); |
- |
- // Hiding an action should result in its removal from the toolbar. |
- action_api->SetBrowserActionVisibility(browser_action_b()->id(), false); |
- EXPECT_FALSE( |
- action_api->GetBrowserActionVisibility(browser_action_b()->id())); |
- // Thus, there should now only be two items on the toolbar - A and C. |
- EXPECT_EQ(2u, num_toolbar_items()); |
- EXPECT_EQ(browser_action_a()->id(), GetActionIdAtIndex(0u)); |
- EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(1u)); |
- |
- // Resetting the visibility to 'true' should result in the extension being |
- // added back at its original position. |
- action_api->SetBrowserActionVisibility(browser_action_b()->id(), true); |
- EXPECT_TRUE(action_api->GetBrowserActionVisibility(browser_action_b()->id())); |
- // So the toolbar order should be 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)); |
- EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(2u)); |
-} |
- |
TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarIncognitoModeTest) { |
Init(); |
ASSERT_TRUE(AddBrowserActionExtensions()); |
@@ -1120,8 +1063,6 @@ TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarIncognitoEnableExtension) { |
// overflow menu when the redesign switch is enabled. |
TEST_F(ToolbarActionsModelUnitTest, |
ActionsToolbarActionsVisibilityWithSwitchAndComponentActions) { |
- extensions::FeatureSwitch::ScopedOverride enable_redesign( |
- extensions::FeatureSwitch::extension_action_redesign(), true); |
Init(); |
// We choose to use all types of extensions here, since the misnamed |
@@ -1249,8 +1190,6 @@ TEST_F(ToolbarActionsModelUnitTest, ToolbarModelPrefChange) { |
// toolbar with component actions. |
TEST_F(ToolbarActionsModelUnitTest, |
ActionsToolbarReorderAndReinsertWithSwitchAndComponentActions) { |
- extensions::FeatureSwitch::ScopedOverride enable_redesign( |
- extensions::FeatureSwitch::extension_action_redesign(), true); |
InitWithMockActionsFactory(); |
// One component action was added when the model was initialized. |