summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Wilken Dörrie <jdoerrie@chromium.org>2021-03-11 18:13:05 +0000
committerCopybara-Service <copybara-worker@google.com>2021-03-11 10:17:59 -0800
commit09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e (patch)
treee6c29898b1087b6411b5bbdfc6ee9624577885cc
parent348acca950b1d6de784a954f4fda0952046c652c (diff)
downloadzlib-09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e.tar.gz
[LSC] Replace base::string16 with std::u16string in //[f-z]*
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 <jdoerrie@chromium.org> Owners-Override: Jan Wilken Dörrie <jdoerrie@chromium.org> Owners-Override: danakj <danakj@chromium.org> Auto-Submit: Jan Wilken Dörrie <jdoerrie@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/master@{#862044} GitOrigin-RevId: 739ccc21289257112c667e04a40d9a5a2db466bf
-rw-r--r--google/zip_reader.cc2
1 files changed, 1 insertions, 1 deletions
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;