[Extenisons UI] Remove extension_action_redesign logic from the toolbar

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 "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 25 matching lines @@
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #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"
 
 namespace {
 
 // A simple observer that tracks the number of times certain events occur.
 class ToolbarActionsModelTestObserver : public ToolbarActionsModel::Observer {
  public:
   explicit ToolbarActionsModelTestObserver(ToolbarActionsModel* model);
   ~ToolbarActionsModelTestObserver() override;
@@ skipping 772 matching lines @@
 
   // Should be at max size.
   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, 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());
 
   // 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));
@@ skipping 30 matching lines @@
   scoped_refptr<const extensions::Extension> internal_extension_no_action =
       extensions::extension_action_test_util::CreateActionExtension(
           "internal ext no action",
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::INTERNAL);
   EXPECT_TRUE(AddExtension(internal_extension_no_action.get()));
   EXPECT_EQ(4u, num_toolbar_items());
   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());
 
   // Give two extensions incognito access.
   // Note: We use ExtensionPrefs::SetIsIncognitoEnabled instead of
   // util::SetIsIncognitoEnabled because the latter tries to reload the
   // extension, which requries a filepath associated with the extension (and,
   // for this test, reloading the extension is irrelevant to us).
   extensions::ExtensionPrefs* extension_prefs =
@@ skipping 154 matching lines @@
   EXPECT_EQ(2u, incognito_model->toolbar_items().size());
   EXPECT_EQ(extension_a, GetActionIdAtIndex(0u, incognito_model));
   EXPECT_EQ(extension_b, GetActionIdAtIndex(1u, incognito_model));
   EXPECT_EQ(1u, incognito_model->visible_icon_count());
 }
 
 // Test that hiding actions on the toolbar results in sending them to the
 // 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
   // BrowserActionVisibility is now for toolbar visibility.
   ASSERT_TRUE(AddActionExtensions());
 
   // For readability, alias extensions A B C.
   const extensions::Extension* extension_a = browser_action();
   const extensions::Extension* extension_b = page_action();
   const extensions::Extension* extension_c = no_action();
@@ skipping 107 matching lines @@
   EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(1));
   EXPECT_EQ(browser_action_a()->id(), GetActionIdAtIndex(2));
   EXPECT_EQ(inserted_and_removed_difference,
             observer()->inserted_count() - observer()->removed_count());
 }
 
 // Test various different reorderings, removals, and reinsertions of the
 // 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.
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(component_action_id(), GetActionIdAtIndex(0u));
   EXPECT_TRUE(toolbar_model()->HasComponentAction(component_action_id()));
 
   // Add the three browser action extensions.
   ASSERT_TRUE(AddBrowserActionExtensions());
 
@@ skipping 200 matching lines @@
   InitializeEmptyExtensionService();
   ToolbarActionsModel* toolbar_model = extensions::extension_action_test_util::
       CreateToolbarModelForProfileWithoutWaitingForReady(profile());
   ASSERT_FALSE(toolbar_model->actions_initialized());
 
   // AddComponentAction() should be a no-op if actions_initialized() is false.
   toolbar_model->AddComponentAction(component_action_id());
   EXPECT_EQ(0u, toolbar_model->toolbar_items().size());
   EXPECT_FALSE(toolbar_model->HasComponentAction(component_action_id()));
 }