Fix adding steps using default steps

Requires:
 - https://review.tizen.org/gerrit/c/platform/core/appfw/app-installers/+/207215

Change-Id: Ibba0273f806b5c636b23a5bc7b9924b5a91758f7
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index 3994b7cbb436efb6f15abb58aff07311115dd637..a2b769f51703c2903b243612a1e1a709ef60d53c 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -3,88 +3,8 @@
 
 #include <common/app_installer.h>
 #include <common/privileges.h>
-#include <common/step/backup/step_backup_icons.h>
-#include <common/step/backup/step_backup_manifest.h>
-#include <common/step/backup/step_copy_backup.h>
-#include <common/step/configuration/step_block_cross_update.h>
-#include <common/step/configuration/step_check_install_location.h>
-#include <common/step/configuration/step_check_tizen_version.h>
-#include <common/step/configuration/step_configure.h>
-#include <common/step/configuration/step_fail.h>
-#include <common/step/configuration/step_parse_manifest.h>
-#include <common/step/configuration/step_parse_preload.h>
-#include <common/step/configuration/step_switch_readonly_mode.h>
-#include <common/step/filesystem/step_acquire_external_storage.h>
-#include <common/step/filesystem/step_optional_acquire_external_storage.h>
-#include <common/step/filesystem/step_change_ownership_and_permission.h>
-#include <common/step/filesystem/step_copy.h>
-#include <common/step/filesystem/step_copy_storage_directories.h>
-#include <common/step/filesystem/step_copy_tep.h>
-#include <common/step/filesystem/step_create_icons.h>
-#include <common/step/filesystem/step_create_globalapp_symlinks.h>
-#include <common/step/filesystem/step_create_storage_directories.h>
-#include <common/step/filesystem/step_update_storage_directories.h>
-#include <common/step/filesystem/step_delta_patch.h>
-#include <common/step/filesystem/step_disable_external_mount.h>
-#include <common/step/filesystem/step_enable_external_mount.h>
-#include <common/step/filesystem/step_migrate_legacy_external_image.h>
-#include <common/step/filesystem/step_move_installed_storage.h>
-#include <common/step/filesystem/step_recover_change_owner.h>
-#include <common/step/filesystem/step_recover_files.h>
-#include <common/step/filesystem/step_recover_globalapp_symlinks.h>
-#include <common/step/filesystem/step_recover_icons.h>
-#include <common/step/filesystem/step_recover_manifest.h>
-#include <common/step/filesystem/step_recover_external_storage.h>
-#include <common/step/filesystem/step_recover_storage_directories.h>
-#include <common/step/filesystem/step_remove_files.h>
-#include <common/step/filesystem/step_remove_globalapp_symlinks.h>
-#include <common/step/filesystem/step_remove_icons.h>
-#include <common/step/filesystem/step_remove_per_user_storage_directories.h>
-#include <common/step/filesystem/step_remove_temporary_directory.h>
-#include <common/step/filesystem/step_remove_tep.h>
-#include <common/step/filesystem/step_remove_user_data.h>
-#include <common/step/filesystem/step_remove_zip_image.h>
-#include <common/step/filesystem/step_unzip.h>
-#include <common/step/filesystem/step_update_tep.h>
-#include <common/step/mount/step_check_mount_path.h>
-#include <common/step/mount/step_mount_unpacked.h>
-#include <common/step/mount/step_mount_install.h>
-#include <common/step/mount/step_mount_recover.h>
-#include <common/step/mount/step_mount_update.h>
-#include <common/step/pkgmgr/step_check_force_clean.h>
-#include <common/step/pkgmgr/step_check_installable.h>
-#include <common/step/pkgmgr/step_check_removable.h>
-#include <common/step/pkgmgr/step_check_restriction.h>
-#include <common/step/pkgmgr/step_check_upgradable.h>
-#include <common/step/pkgmgr/step_kill_apps.h>
-#include <common/step/pkgmgr/step_recover_application.h>
-#include <common/step/pkgmgr/step_recover_parser_plugins.h>
-#include <common/step/pkgmgr/step_register_app.h>
-#include <common/step/pkgmgr/step_remove_manifest.h>
-#include <common/step/pkgmgr/step_run_parser_plugins.h>
-#include <common/step/pkgmgr/step_unregister_app.h>
-#include <common/step/pkgmgr/step_update_app.h>
-#include <common/step/pkgmgr/step_update_pkg_disable_info.h>
-#include <common/step/rds/step_rds_modify.h>
-#include <common/step/rds/step_rds_parse.h>
-#include <common/step/recovery/step_open_recovery_file.h>
-#include <common/step/recovery/step_create_recovery_file.h>
-#include <common/step/security/step_check_old_certificate.h>
-#include <common/step/security/step_get_privilege_level.h>
-#include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
 #include <common/step/security/step_recover_privilege_compatibility.h>
-#include <common/step/security/step_recover_security.h>
-#include <common/step/security/step_register_security.h>
-#include <common/step/security/step_revoke_security.h>
-#include <common/step/security/step_rollback_deinstallation_security.h>
-#include <common/step/security/step_rollback_installation_security.h>
-#include <common/step/security/step_signature.h>
-#include <common/step/security/step_update_security.h>
-#include <common/step/security/step_recover_trust_anchor.h>
-#include <common/step/security/step_register_trust_anchor.h>
-#include <common/step/security/step_revoke_trust_anchor.h>
-#include <common/step/security/step_unregister_trust_anchor.h>
 
 #include "tpk/step/configuration/step_adjust_install_location.h"
 #include "tpk/step/configuration/step_check_reinstall_manifest.h"
@@ -120,595 +40,227 @@ TpkInstaller::~TpkInstaller() {
 
 
 void TpkInstaller::InstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckInstallable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::InstallSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("Signature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepAcquireExternalStorage>(false);
-  AddStep<ci::security::StepRollbackInstallationSecurity>();
-  AddStep<ci::filesystem::StepCopy>();
-  AddStep<ci::filesystem::StepCopyTep>();
-  AddStep<tpk::filesystem::StepCreateExternalStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepRegisterApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Install);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepCreateExternalStorageDirectories>(
+      "CreateStorageDirectories");
 }
 
 void TpkInstaller::UpdateSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::UpdateSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepBlockCrossUpdate>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::backup::StepBackupManifest>();
-  AddStep<ci::backup::StepBackupIcons>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepAcquireExternalStorage>(true);
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::backup::StepCopyBackup>();
-  AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepCopyStorageDirectories>();
-  AddStep<tpk::filesystem::StepUpdateExternalStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepUpdateExternalStorageDirectories>(
+      "CopyStorageDirectories");
 }
 
 void TpkInstaller::UninstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::pkgmgr::StepCheckRemovable>();
-  AddStep<ci::pkgmgr::StepCheckForceClean>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
-  AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
-  AddStep<tpk::filesystem::StepRemoveExternalStorageDirectories>();
-  AddStep<ci::pkgmgr::StepUnregisterApplication>();
-  AddStep<ci::filesystem::StepRemoveTep>();
-  AddStep<ci::security::StepUnregisterTrustAnchor>();
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
-  AddStep<ci::filesystem::StepRemoveFiles>();
-  AddStep<ci::filesystem::StepRemoveZipImage>();
-  AddStep<ci::filesystem::StepRemoveIcons>();
-  AddStep<ci::security::StepRevokeSecurity>();
-  AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AppInstaller::UninstallSteps();
+  AddStepAfter<tpk::filesystem::StepRemoveExternalStorageDirectories>(
+      "RemovePerUserStorageDirectories");
 }
 
 void TpkInstaller::ReinstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<tpk::configuration::StepCheckReinstallManifest>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ReinstallSteps();
+  AddStepAfter<tpk::configuration::StepCheckReinstallManifest>("Configure");
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepBlockCrossUpdate>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::backup::StepBackupManifest>();
-  AddStep<ci::backup::StepBackupIcons>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::rds::StepRDSParse>();
-  AddStep<ci::rds::StepRDSModify>();
-  AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::filesystem::StepUpdateExternalStorageDirectories>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepUpdateExternalStorageDirectories>(
+      "UpdateStorageDirectories");
 }
 
 void TpkInstaller::DeltaSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::filesystem::StepEnableExternalMount>();
-  AddStep<ci::filesystem::StepDeltaPatch>();
-  AddStep<ci::filesystem::StepDisableExternalMount>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::DeltaSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepBlockCrossUpdate>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::backup::StepBackupManifest>();
-  AddStep<ci::backup::StepBackupIcons>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepAcquireExternalStorage>(true);
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::backup::StepCopyBackup>();
-  AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepCopyStorageDirectories>();
-  AddStep<tpk::filesystem::StepUpdateExternalStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepUpdateExternalStorageDirectories>(
+      "CopyStorageDirectories");
 }
 
 void TpkInstaller::MoveSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::filesystem::StepMoveInstalledStorage>();
-  AddStep<ci::security::StepRegisterSecurity>();
+  AppInstaller::MoveSteps();
 }
 
 void TpkInstaller::RecoverySteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepOpenRecoveryFile>();
-  AddStep<ci::filesystem::StepRemoveTemporaryDirectory>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::RECOVERY,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::filesystem::StepRecoverIcons>();
-  AddStep<ci::pkgmgr::StepRecoverParserPlugin>();
-  AddStep<ci::filesystem::StepRecoverManifest>();
-  AddStep<ci::filesystem::StepRecoverExternalStorage>();
-  AddStep<ci::filesystem::StepRecoverStorageDirectories>();
-  AddStep<ci::filesystem::StepRecoverGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepRecoverFiles>();
-  AddStep<ci::mount::StepMountRecover>();
-  AddStep<tpk::security::StepTpkRecoverSignature>();
-  AddStep<ci::security::StepRecoverPrivilegeCompatibility>(
+  AppInstaller::RecoverySteps();
+  AddStepAfter<tpk::security::StepTpkRecoverSignature>("MountRecover");
+  AddStepAfter<ci::security::StepRecoverPrivilegeCompatibility>(
+      "TpkRecoverSignature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<ci::filesystem::StepRecoverChangeOwner>();
-  AddStep<ci::security::StepRecoverSecurity>();
-  AddStep<ci::pkgmgr::StepRecoverApplication>();
-  AddStep<ci::security::StepRecoverTrustAnchor>();
 }
 
 void TpkInstaller::MountInstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::mount::StepMountUnpacked>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckInstallable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::MountInstallSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("Signature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepRollbackInstallationSecurity>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::mount::StepMountInstall>();
-  AddStep<tpk::filesystem::StepTpkPreparePackageDirectory>();
-  AddStep<ci::filesystem::StepCopyTep>();
-  AddStep<tpk::filesystem::StepCreateExternalStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepRegisterApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Install);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPreparePackageDirectory>("MountInstall");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepCreateExternalStorageDirectories>(
+      "CreateStorageDirectories");
 }
 
 void TpkInstaller::MountUpdateSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::mount::StepMountUnpacked>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::configuration::StepCheckInstallLocation>();
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::MountUpdateSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepBlockCrossUpdate>();
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::backup::StepBackupManifest>();
-  AddStep<ci::backup::StepBackupIcons>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::mount::StepMountUpdate>();
-  AddStep<tpk::filesystem::StepTpkPreparePackageDirectory>();
-  AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<tpk::filesystem::StepUpdateExternalStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPreparePackageDirectory>("MountUpdate");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepUpdateExternalStorageDirectories>(
+      "UpdateStorageDirectories");
 }
 
 void TpkInstaller::ManifestDirectInstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepCheckInstallable>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<tpk::filesystem::StepCheckPkgDirPath>();
-  AddStep<ci::mount::StepCheckMountPath>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ManifestDirectInstallSteps();
+  AddStepAfter<tpk::filesystem::StepCheckPkgDirPath>("CheckMountPath");
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("Signature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::security::StepRollbackInstallationSecurity>();
-  AddStep<ci::pkgmgr::StepRegisterApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Install);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "RemoveGlobalAppSymlinks");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
 }
 
 void TpkInstaller::ManifestDirectUpdateSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::mount::StepCheckMountPath>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ManifestDirectUpdateSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::security::StepRollbackInstallationSecurity>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "RemoveGlobalAppSymlinks");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
 }
 
 void TpkInstaller::ManifestPartialInstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepSignature>(false);
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ManifestPartialInstallSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("Signature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::pkgmgr::StepRegisterApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Install);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
 }
 
 void TpkInstaller::ManifestPartialUpdateSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepSignature>(false);
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ManifestPartialUpdateSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepRegisterSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
 }
 
 void TpkInstaller::PartialUninstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::pkgmgr::StepCheckRemovable>();
-  AddStep<ci::pkgmgr::StepCheckForceClean>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
-  AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
-  AddStep<tpk::filesystem::StepRemoveExternalStorageDirectories>();
-  AddStep<ci::pkgmgr::StepUnregisterApplication>();
-  AddStep<ci::security::StepUnregisterTrustAnchor>();
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
-  AddStep<ci::security::StepRevokeSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
+  AppInstaller::PartialUninstallSteps();
+  AddStepAfter<tpk::filesystem::StepRemoveExternalStorageDirectories>(
+      "RemovePerUserStorageDirectories");
 }
 
 void TpkInstaller::ReadonlyUpdateInstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::recovery::StepCreateRecoveryFile>();
-  AddStep<ci::filesystem::StepUnzip>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::PACKAGE,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepSignature>(true);
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ReadonlyUpdateInstallSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("CheckOldCertificate",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
-  AddStep<ci::security::StepCheckOldCertificate>();
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::configuration::StepBlockCrossUpdate>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::filesystem::StepCopy>();
-  AddStep<ci::filesystem::StepCopyTep>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateExternalStorageDirectories>();
-  AddStep<tpk::filesystem::StepCreateTpkSymbolicLink>();
-  AddStep<tpk::filesystem::StepTpkPatchIcons>();
-  AddStep<tpk::pkgmgr::StepConvertXml>();
-  AddStep<tpk::pkgmgr::StepManifestAdjustment>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-  AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
+  AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
+  AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
+      "TpkPatchIcons");
+  AddStepAfter<tpk::pkgmgr::StepConvertXml>("CreateTpkSymbolicLink");
+  AddStepAfter<tpk::pkgmgr::StepManifestAdjustment>("ConvertXml");
+  AddStepAfter<tpk::filesystem::StepCreateExternalStorageDirectories>(
+      "CreateStorageDirectories");
 }
 
 void TpkInstaller::ReadonlyUpdateUninstallSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::pkgmgr::StepCheckRestriction>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepCheckUpgradable>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepSignature>(false);
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::ReadonlyUpdateUninstallSteps();
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("Signature",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
-  AddStep<tpk::filesystem::StepRemoveExternalStorageDirectories>();
-  AddStep<ci::pkgmgr::StepUpdateApplication>();
-  AddStep<ci::security::StepRollbackDeinstallationSecurity>();
-  AddStep<ci::filesystem::StepRemoveTep>();
-  AddStep<ci::security::StepRevokeTrustAnchor>();
-  AddStep<ci::security::StepRegisterTrustAnchor>(
-      ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::security::StepPrivacyPrivilege>(
-      ci::security::StepPrivacyPrivilege::ActionType::Update);
-  AddStep<ci::filesystem::StepRemoveFiles>();
-  AddStep<ci::filesystem::StepRemoveZipImage>();
-  AddStep<ci::filesystem::StepRemoveUserData>();
-  AddStep<ci::configuration::StepSwitchReadonlyMode>();
-  AddStep<ci::security::StepUpdateSecurity>();
-  AddStep<ci::pkgmgr::StepRemoveManifest>();
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
+  AddStepAfter<tpk::security::StepCheckTpkBackgroundCategory>(
+      "PrivilegeCompatibility");
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>(
+      "CheckTpkBackgroundCategory");
 }
 
 void TpkInstaller::DisablePkgSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepKillApps>();
-  AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
-      ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
+  AppInstaller::DisablePkgSteps();
 }
 
 void TpkInstaller::EnablePkgSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
-      ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Install);
+  AppInstaller::EnablePkgSteps();
 }
 
 void TpkInstaller::MigrateExtImgSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::security::StepMigrateLegacyExtImage>();
-  AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
+  AppInstaller::MigrateExtImgSteps();
 }
 
 void TpkInstaller::RecoverDBSteps() {
-  AddStep<ci::configuration::StepConfigure>(pkgmgr_);
-  AddStep<ci::configuration::StepParseManifest>(
-      ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
-      ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepCheckInstallable>();
-  AddStep<ci::mount::StepCheckMountPath>();
-  AddStep<ci::configuration::StepParsePreload>();
-  AddStep<tpk::configuration::StepAdjustInstallLocation>();
-  AddStep<ci::security::StepGetPrivilegeLevel>();
-  AddStep<ci::security::StepPrivilegeCompatibility>(
+  AppInstaller::RecoverDBSteps();
+  AddStepAfter<tpk::configuration::StepAdjustInstallLocation>("ParsePreload");
+  AddStepAfter<ci::security::StepPrivilegeCompatibility>("GetPrivilegeLevel",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
-  AddStep<ci::pkgmgr::StepRegisterApplication>();
 }
 
 }  // namespace tpk