Remove extension-to-component migration mechanism

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

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 c39f29ddc3d5d4d4f0456de878752f52404d80ce..0dcac11de5dbff34afae15bc2eb2b5e590da5184 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -127,25 +127,6 @@ class ToolbarActionsModelUnitTest
   // ExtensionSystem.
   void Init();
 
-  enum class MigrationStatus {
-    // The feature is enabled without any extension to migrate.
-    FEATURE_ENABLED_NO_EXTENSION,
-    // The feature is enabled and the user has installed an extension.
-    FEATURE_ENABLED_EXTENSION_INSTALLED,
-    // Feature is enabled with extension and a pref of false.
-    FEATURE_ENABLED_WITH_PREF_FALSE,
-    // Feature is enabled with extension and a pref of true.
-    FEATURE_ENABLED_WITH_PREF_TRUE,
-    // The feature is now disabled after previously being enabled, and the user
-    // has a pref reflecting a previous migration.
-    FEATURE_DISABLED_WITH_PREF_TRUE,
-  };
-
-  // Initialize the ExtensionService, ToolbarActionsModel, and ExtensionSystem,
-  // and an action extension to migrate to a component.  |migration_status|
-  // is used to configure the user's initial migration status.
-  void InitForMigrationTest(MigrationStatus migration_status);
-
   void TearDown() override;
 
   // Adds or removes the given |extension| and verify success.
@@ -163,9 +144,6 @@ class ToolbarActionsModelUnitTest
   // action, and are added in that order.
   testing::AssertionResult AddActionExtensions() WARN_UNUSED_RESULT;
 
-  // Creates an extension that is to be migrated to a component action.
-  void CreateMigratedActionExtension();
-
   // Returns the action's id at the given index in the toolbar model, or empty
   // if one does not exist.
   // If |model| is specified, it is used. Otherwise, this defaults to
@@ -199,9 +177,6 @@ class ToolbarActionsModelUnitTest
   const extensions::Extension* browser_action() const {
     return browser_action_extension_.get();
   }
-  const extensions::Extension* browser_action_migrated() const {
-    return browser_action_migrated_.get();
-  }
   const extensions::Extension* page_action() const {
     return page_action_extension_.get();
   }
@@ -230,7 +205,6 @@ class ToolbarActionsModelUnitTest
   scoped_refptr<const extensions::Extension> browser_action_a_;
   scoped_refptr<const extensions::Extension> browser_action_b_;
   scoped_refptr<const extensions::Extension> browser_action_c_;
-  scoped_refptr<const extensions::Extension> browser_action_migrated_;
 
   // Sample extensions with different kinds of actions.
   scoped_refptr<const extensions::Extension> browser_action_extension_;
@@ -250,47 +224,6 @@ void ToolbarActionsModelUnitTest::Init() {
   model_observer_.reset(new ToolbarActionsModelTestObserver(toolbar_model_));
 }
 
-void ToolbarActionsModelUnitTest::InitForMigrationTest(
-    MigrationStatus migration_status) {
-  InitializeEmptyExtensionService();
-  SetMockActionsFactory(new MockComponentToolbarActionsFactory(nullptr));
-  CreateMigratedActionExtension();
-
-  {
-    DictionaryPrefUpdate update(profile()->GetPrefs(),
-                                ::prefs::kToolbarMigratedComponentActionStatus);
-    switch (migration_status) {
-      case MigrationStatus::FEATURE_ENABLED_EXTENSION_INSTALLED:
-        mock_actions_factory_->set_migrated_feature_enabled(true);
-        ASSERT_TRUE(AddExtension(browser_action_migrated()));
-        break;
-      case MigrationStatus::FEATURE_ENABLED_NO_EXTENSION:
-        mock_actions_factory_->set_migrated_feature_enabled(true);
-        break;
-      case MigrationStatus::FEATURE_ENABLED_WITH_PREF_TRUE:
-        mock_actions_factory_->set_migrated_feature_enabled(true);
-        ASSERT_TRUE(AddExtension(browser_action_migrated()));
-        update->SetBoolean(component_action_id(), true);
-        break;
-      case MigrationStatus::FEATURE_ENABLED_WITH_PREF_FALSE:
-        mock_actions_factory_->set_migrated_feature_enabled(true);
-        ASSERT_TRUE(AddExtension(browser_action_migrated()));
-        update->SetBoolean(component_action_id(), false);
-        break;
-      case MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE:
-        mock_actions_factory_->set_migrated_feature_enabled(false);
-        ASSERT_TRUE(AddExtension(browser_action_migrated()));
-        update->SetBoolean(component_action_id(), true);
-        break;
-    }
-  }
-
-  toolbar_model_ =
-      extensions::extension_action_test_util::CreateToolbarModelForProfile(
-          profile());
-  model_observer_.reset(new ToolbarActionsModelTestObserver(toolbar_model_));
-}
-
 void ToolbarActionsModelUnitTest::TearDown() {
   model_observer_.reset();
   extensions::ExtensionServiceTestBase::TearDown();
@@ -368,15 +301,6 @@ ToolbarActionsModelUnitTest::AddBrowserActionExtensions() {
   return AddAndVerifyExtensions(extensions);
 }
 
-void ToolbarActionsModelUnitTest::CreateMigratedActionExtension() {
-  browser_action_migrated_ =
-      extensions::extension_action_test_util::CreateActionExtension(
-          "browser_actionMigrated",
-          extensions::extension_action_test_util::BROWSER_ACTION);
-  mock_actions_factory_->set_migrated_extension_id(
-      browser_action_migrated_->id());
-}
-
 const std::string ToolbarActionsModelUnitTest::GetActionIdAtIndex(
     size_t index,
     const ToolbarActionsModel* model) const {
@@ -1535,60 +1459,3 @@ TEST_F(ToolbarActionsModelUnitTest, AddComponentActionBeforeInitialization) {
   EXPECT_EQ(0u, toolbar_model->toolbar_items().size());
   EXPECT_FALSE(toolbar_model->HasComponentAction(component_action_id()));
 }
-
-TEST_F(ToolbarActionsModelUnitTest,
-       NoMigrationToComponentActionWithoutExtension) {
-  extensions::FeatureSwitch::ScopedOverride enable_redesign(
-      extensions::FeatureSwitch::extension_action_redesign(), true);
-  InitForMigrationTest(MigrationStatus::FEATURE_ENABLED_NO_EXTENSION);
-
-  EXPECT_EQ(0u, num_toolbar_items());
-}
-
-TEST_F(ToolbarActionsModelUnitTest, MigrationFromExtensionToComponentAction) {
-  extensions::FeatureSwitch::ScopedOverride enable_redesign(
-      extensions::FeatureSwitch::extension_action_redesign(), true);
-  InitForMigrationTest(MigrationStatus::FEATURE_ENABLED_EXTENSION_INSTALLED);
-
-  // Initialization disables the extension and adds the migrated component
-  // action.
-  EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(component_action_id(), GetActionIdAtIndex(0u));
-}
-
-TEST_F(ToolbarActionsModelUnitTest, MigratedComponentActionAddedWithPrefTrue) {
-  extensions::FeatureSwitch::ScopedOverride enable_redesign(
-      extensions::FeatureSwitch::extension_action_redesign(), true);
-  InitForMigrationTest(MigrationStatus::FEATURE_ENABLED_WITH_PREF_TRUE);
-
-  EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(component_action_id(), GetActionIdAtIndex(0u));
-}
-
-TEST_F(ToolbarActionsModelUnitTest, NoMigratedComponentActionWithPrefFalse) {
-  extensions::FeatureSwitch::ScopedOverride enable_redesign(
-      extensions::FeatureSwitch::extension_action_redesign(), true);
-  InitForMigrationTest(MigrationStatus::FEATURE_ENABLED_WITH_PREF_FALSE);
-
-  EXPECT_EQ(0u, num_toolbar_items());
-}
-
-TEST_F(ToolbarActionsModelUnitTest, MigrationFromComponentActionToExtension) {
-  extensions::FeatureSwitch::ScopedOverride enable_redesign(
-      extensions::FeatureSwitch::extension_action_redesign(), true);
-  InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE);
-
-  // Initialization re-enables the extension and removes the migrated component
-  // action.
-  EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u));
-}
-
-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));
-}