Remove extension-to-component migration mechanism

chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
index f4e75a92de03938737b29b734c5563df7f11b96f..f2068c1734e23323cdfc10eef0731137032c0cdc 100644
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
@@ -26,10 +26,7 @@ MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
 std::set<std::string>
 MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {
   std::set<std::string> ids;
-  // kActionIdForTesting is installed by default if we are not testing
-  // a migration scenario.
-  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled() &&
-      migrated_extension_id_.empty()) {
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {

[msw, 2017/02/08 02:14:02]

nit: remove curlies

[takumif, 2017/02/08 03:35:41]

Done.

     ids.insert(kActionIdForTesting);
   }
   return ids;
@@ -45,23 +42,3 @@ MockComponentToolbarActionsFactory::GetComponentToolbarActionForId(
       new TestToolbarActionViewController(
           MockComponentToolbarActionsFactory::kActionIdForTesting));
 }
-
-void MockComponentToolbarActionsFactory::RegisterComponentMigrations(
-    extensions::ComponentMigrationHelper* helper) const {
-  if (!migrated_extension_id_.empty()) {
-    helper->Register(kActionIdForTesting, migrated_extension_id_);
-  }
-}
-
-void MockComponentToolbarActionsFactory::HandleComponentMigrations(
-    extensions::ComponentMigrationHelper* helper,
-    Profile* profile) const {
-  if (migrated_extension_id_.empty())
-    return;
-
-  if (migrated_feature_enabled_) {
-    helper->OnFeatureEnabled(kActionIdForTesting);
-  } else {
-    helper->OnFeatureDisabled(kActionIdForTesting);
-  }
-}