From 348acca950b1d6de784a954f4fda0952046c652c Mon Sep 17 00:00:00 2001 From: Daniel Cheng Date: Mon, 22 Feb 2021 21:03:08 +0000 Subject: Use std::move() with base::Passed() for base::BindOnce(), part 1. std::move() and base::Passed() mean the same thing for base::BindOnce, so use the standard library idiom instead. Bug: 1180750 Change-Id: I10737d95c52b69c2bf594058ff46047d16d80858 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2711965 Reviewed-by: Colin Blundell Reviewed-by: Nico Weber Reviewed-by: Joe Downing Reviewed-by: Bill Budge Reviewed-by: Avi Drissman Reviewed-by: Reilly Grant Reviewed-by: Thomas Guilbert Reviewed-by: Sean Topping Commit-Queue: Daniel Cheng Cr-Commit-Position: refs/heads/master@{#856429} GitOrigin-RevId: 28a5ac480de97fe18bcd55d11bfa06e68d6e808e --- google/zip_reader.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/google/zip_reader.cc b/google/zip_reader.cc index 96e9ff0..1e86afe 100644 --- a/google/zip_reader.cc +++ b/google/zip_reader.cc @@ -334,9 +334,9 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync( base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), - Passed(std::move(output_file)), - std::move(success_callback), std::move(failure_callback), - progress_callback, 0 /* initial offset */)); + std::move(output_file), std::move(success_callback), + std::move(failure_callback), progress_callback, + 0 /* initial offset */)); } bool ZipReader::ExtractCurrentEntryToString(uint64_t max_read_bytes, @@ -436,9 +436,9 @@ void ZipReader::ExtractChunk(base::File output_file, base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), - Passed(std::move(output_file)), - std::move(success_callback), std::move(failure_callback), - progress_callback, current_progress)); + std::move(output_file), std::move(success_callback), + std::move(failure_callback), progress_callback, + current_progress)); } } -- cgit v1.2.3 From 09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wilken=20D=C3=B6rrie?= Date: Thu, 11 Mar 2021 18:13:05 +0000 Subject: [LSC] Replace base::string16 with std::u16string in //[f-z]* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change replaces base::string16 with std::u16string in //[f-z]* Reproduction steps: $ git grep -lw 'base::string16' [f-z]* | \ xargs sed -i 's/\bbase::string16\b/std::u16string/g' $ git cl format Bug: 1184339 Change-Id: I4e0ff2fd300c9fd9360dbf8f4b44e74f5f511797 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2752148 Commit-Queue: Jan Wilken Dörrie Owners-Override: Jan Wilken Dörrie Owners-Override: danakj Auto-Submit: Jan Wilken Dörrie Reviewed-by: danakj Cr-Commit-Position: refs/heads/master@{#862044} GitOrigin-RevId: 739ccc21289257112c667e04a40d9a5a2db466bf --- google/zip_reader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/zip_reader.cc b/google/zip_reader.cc index 1e86afe..1910cf2 100644 --- a/google/zip_reader.cc +++ b/google/zip_reader.cc @@ -101,7 +101,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip, is_unsafe_ = file_path_.ReferencesParent(); // We also consider that the file name is unsafe, if it's invalid UTF-8. - base::string16 file_name_utf16; + std::u16string file_name_utf16; if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(), &file_name_utf16)) { is_unsafe_ = true; -- cgit v1.2.3