From 261f4df0801de80106dd28a47914131c9b897058 Mon Sep 17 00:00:00 2001 From: Alexei Svitkine Date: Tue, 16 Nov 2021 22:01:32 +0000 Subject: Update callsites to use WIN_-prefixed base::File flags. The flags have been renamed to make it clear that they only apply to Windows (see associated bug). If you're reviewing this CL, please verify your code's usage of the flag to ensure that the behavior is as intended. Thanks! This CL was uploaded by git cl split. R=huangs@chromium.org Bug: 1244149 Change-Id: I08d4f6e886a699d852470e08025edb85b0a695ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279224 Auto-Submit: Alexei Svitkine Reviewed-by: Samuel Huang Commit-Queue: Samuel Huang Cr-Commit-Position: refs/heads/main@{#942295} NOKEYCHECK=True GitOrigin-RevId: 9f7f7c8f781c5b7946dc9be3f80cc28cda9e971c --- zucchini_integration.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'zucchini_integration.cc') diff --git a/zucchini_integration.cc b/zucchini_integration.cc index bf28b3c..c654a08 100644 --- a/zucchini_integration.cc +++ b/zucchini_integration.cc @@ -184,11 +184,12 @@ status::Code Generate(const base::FilePath& old_path, std::string imposed_matches) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | + File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return GenerateCommon(std::move(old_file), std::move(new_file), @@ -211,11 +212,11 @@ status::Code Apply(const base::FilePath& old_path, bool force_keep) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File patch_file(patch_path, File::FLAG_OPEN | File::FLAG_READ | - base::File::FLAG_SHARE_DELETE); + base::File::FLAG_WIN_SHARE_DELETE); File new_file(new_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ | - File::FLAG_WRITE | File::FLAG_SHARE_DELETE | + File::FLAG_WRITE | File::FLAG_WIN_SHARE_DELETE | File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, new_path, patch_path); return ApplyCommon(std::move(old_file), std::move(patch_file), -- cgit v1.2.3