Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3800)

Unified Diff: chrome/installer/util/installer_state.cc

Issue 1666363002: Delete old files after an update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: self-review Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 3da5a9967235254ae240a25eea44318d1859a318..f2d4eb2d254489f510de828b44fb1bb2edb314d1 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -11,8 +11,6 @@
#include <utility>
#include "base/command_line.h"
-#include "base/file_version_info.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -514,69 +512,6 @@ bool InstallerState::AnyExistsAndIsInUse(const InstallationState& machine_state,
return false;
}
-void InstallerState::GetExistingExeVersions(
- std::set<std::string>* existing_versions) const {
-
- static const wchar_t* const kChromeFilenames[] = {
- installer::kChromeExe,
- installer::kChromeNewExe,
- installer::kChromeOldExe,
- };
-
- for (size_t i = 0; i < arraysize(kChromeFilenames); ++i) {
- base::FilePath chrome_exe(target_path().Append(kChromeFilenames[i]));
- scoped_ptr<FileVersionInfo> file_version_info(
- FileVersionInfo::CreateFileVersionInfo(chrome_exe));
- if (file_version_info) {
- base::string16 version_string = file_version_info->file_version();
- if (!version_string.empty() && base::IsStringASCII(version_string))
- existing_versions->insert(base::UTF16ToASCII(version_string));
- }
- }
-}
-
-void InstallerState::RemoveOldVersionDirectories(
- const Version& new_version,
- Version* existing_version,
- const base::FilePath& temp_path) const {
- Version version;
- scoped_ptr<WorkItem> item;
-
- std::set<std::string> existing_version_strings;
- existing_version_strings.insert(new_version.GetString());
- if (existing_version)
- existing_version_strings.insert(existing_version->GetString());
-
- // Make sure not to delete any version dir that is "referenced" by an existing
- // Chrome executable.
- GetExistingExeVersions(&existing_version_strings);
-
- // Try to delete all directories that are not in the set we care to keep.
- base::FileEnumerator version_enum(target_path(), false,
- base::FileEnumerator::DIRECTORIES);
- for (base::FilePath next_version = version_enum.Next(); !next_version.empty();
- next_version = version_enum.Next()) {
- base::FilePath dir_name(next_version.BaseName());
- version = Version(base::UTF16ToASCII(dir_name.value()));
- // Delete the version folder if it is less than the new version and not
- // equal to the old version (if we have an old version).
- if (version.IsValid() &&
- existing_version_strings.count(version.GetString()) == 0) {
- // Note: temporarily log old version deletion at ERROR level to make it
- // more likely we see this in the installer log.
- LOG(ERROR) << "Deleting old version directory: " << next_version.value();
-
- // Attempt to recursively delete the old version dir.
- bool delete_succeeded = base::DeleteFile(next_version, true);
-
- // Note: temporarily log old version deletion at ERROR level to make it
- // more likely we see this in the installer log.
- LOG_IF(ERROR, !delete_succeeded)
- << "Failed to delete old version directory: " << next_version.value();
- }
- }
-}
-
void InstallerState::AddComDllList(
std::vector<base::FilePath>* com_dll_list) const {
for (auto* product : products_)

Powered by Google App Engine
This is Rietveld 408576698