Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr144] CHROME_ARCHIVE_PATH removed from UnPackConsumer metrics enumeration

Browse Source 
Change of enumeration verified with installer team.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/0cf89805957b558d1c118d65c9cbc03ea2ec8646

commit 0cf89805957b558d1c118d65c9cbc03ea2ec8646
Author: Greg Thompson <grt@chromium.org>
Date:   Tue Oct 28 06:39:34 2025 -0700

    [installer] Clean up dead metrics

    Remove LZMA metrics that are no longer recorded. Also mark others as
    never expiring since they are general installer-health metrics and
    update ownership.

    OBSOLETE_HISTOGRAM[Setup.Install.LzmaUnPackStatus_SetupExePatch]=All recording removed in r1522199.
    OBSOLETE_HISTOGRAM[Setup.Install.LzmaUnPackStatus_ChromeArchivePatch]=All recording removed in r1522199.

    Fixed: 455573360
    Change-Id: I7f7f3d8ac99d4b735ae6308f408a245d6474c585
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7088112
    Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
    Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
    Auto-Submit: Greg Thompson <grt@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1536616}
This commit is contained in:
Emerick Rogul
2025-12-21 17:13:20 -05:00
parent e1e081c80f
commit a857f82b4e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/chrome/installer/setup/setup_main.cc
+1 -1
View File
@@ -65,7 +65,7 @@ bool BraveHandleNonInstallCmdLineOptions(
cmd_line.GetSwitchValuePath(installer::switches::kNewSetupExe));
if (installer::ArchivePatchHelper::UncompressAndPatch(
new_setup_exe.DirName(), compressed_archive, setup_exe, new_setup_exe,
installer::UnPackConsumer::SETUP_EXE_PATCH)) {
installer::UnPackConsumer::UNCOMPRESSED_CHROME_ARCHIVE)) {
status = installer::NEW_VERSION_UPDATED;
}
chromium_src/chrome/installer/setup/unpack_archive.cc
+1 -1
View File
@@ -187,7 +187,7 @@ base::expected<base::FilePath, InstallStatus> UnpackChromeArchive(
CreateChromeArchiveHelper(
setup_exe, install_archive, installer_state, unpack_path,
(previous_version.IsValid()
? UnPackConsumer::CHROME_ARCHIVE_PATCH
? UnPackConsumer::UNCOMPRESSED_CHROME_ARCHIVE
: UnPackConsumer::COMPRESSED_CHROME_ARCHIVE)));
if (archive_helper) {
VLOG(1) << "Installing Chrome from compressed archive "
installer/setup/archive_patch_helper_unittest.cc
+3 -3
View File
@@ -51,7 +51,7 @@ TEST_F(ArchivePatchHelperTest, ZucchiniPatching) {
base::FilePath dest = test_dir_.GetPath().AppendASCII("archive2.7z");
installer::ArchivePatchHelper archive_helper(
test_dir_.GetPath(), base::FilePath(), src, dest,
installer::UnPackConsumer::SETUP_EXE_PATCH);
installer::UnPackConsumer::UNCOMPRESSED_CHROME_ARCHIVE);
archive_helper.set_last_uncompressed_file(patch);
EXPECT_TRUE(archive_helper.ZucchiniEnsemblePatch());
base::FilePath base = data_dir_.AppendASCII("archive2.7z");
@@ -64,7 +64,7 @@ TEST_F(ArchivePatchHelperTest, InvalidDiff_MisalignedCblen) {
base::FilePath dest = test_dir_.GetPath().AppendASCII("bin.new");
installer::ArchivePatchHelper archive_helper(
test_dir_.GetPath(), base::FilePath(), src, dest,
installer::UnPackConsumer::SETUP_EXE_PATCH);
installer::UnPackConsumer::UNCOMPRESSED_CHROME_ARCHIVE);
archive_helper.set_last_uncompressed_file(patch);
// Should fail, but not crash.
EXPECT_FALSE(archive_helper.BinaryPatch());
@@ -76,7 +76,7 @@ TEST_F(ArchivePatchHelperTest, InvalidDiff_NegativeSeek) {
base::FilePath dest = test_dir_.GetPath().AppendASCII("bin.new");
installer::ArchivePatchHelper archive_helper(
test_dir_.GetPath(), base::FilePath(), src, dest,
installer::UnPackConsumer::SETUP_EXE_PATCH);
installer::UnPackConsumer::UNCOMPRESSED_CHROME_ARCHIVE);
archive_helper.set_last_uncompressed_file(patch);
// Should fail, but not crash.
EXPECT_FALSE(archive_helper.BinaryPatch());