diff options
author | yosin <yosin@chromium.org> | 2015-07-16 00:10:59 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-16 07:11:43 +0000 |
commit | ddbde8ff8310abbd529ad5cc43e3991e79106a52 (patch) | |
tree | 645dcf37cdb6b7386236aa97d029767adc0d0553 /third_party/zlib/google/zip_reader.cc | |
parent | 1d63b59ad168772d9b1eb1ae45971adc65d07f94 (diff) | |
download | chromium_src-ddbde8ff8310abbd529ad5cc43e3991e79106a52.zip chromium_src-ddbde8ff8310abbd529ad5cc43e3991e79106a52.tar.gz chromium_src-ddbde8ff8310abbd529ad5cc43e3991e79106a52.tar.bz2 |
Revert of Remove some legacy versions of StartsWith and EndsWith. (patchset #6 id:100001 of https://codereview.chromium.org/1239493005/)
Reason for revert:
Compilation error on Windows:
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\chrome\installer\gcapi\gcapi_lib.gcapi.obj.rsp /c ..\..\chrome\installer\gcapi\gcapi.cc /Foobj\chrome\installer\gcapi\gcapi_lib.gcapi.obj /Fdobj\chrome\gcapi_lib.cc.pdb
c:\b\build\slave\win-latest-rel\build\src\chrome\installer\gcapi\gcapi.cc(365) : error C3083: 'StartsWith': the symbol to the left of a '::' must be a type
c:\b\build\slave\win-latest-rel\build\src\chrome\installer\gcapi\gcapi.cc(365) : error C2039: 'INSENSITIVE_ASCII' : is not a member of 'base'
c:\b\build\slave\win-latest-rel\build\src\chrome\installer\gcapi\gcapi.cc(365) : error C2065: 'INSENSITIVE_ASCII' : undeclared identifier
ninja: build stopped: subcommand failed.
Original issue's description:
> Remove some legacy versions of StartsWith and EndsWith.
>
> This just replaces
> true -> base::CompareCase::SENSITIVE
> false -> base::CompareCase::INSENSITIVE_ASCII
>
> I checked the insensitive cases to make sure they're not doing anything suspicious. The old version is a sometimes-correct Unicode comparison so converting to INSENSTITIVE_ASCII isn't a no-op. However, generally the prefix/suffix checking is done against a hardcoded string so there were very few cases to actually look at.
>
> extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc has a not-quite search-and-replace change where I changed the type of a class variable.
>
> BUG=506255
> TBR=jam
>
> Committed: https://crrev.com/edce9a33027cc5f73c4866d70e34f690f6720a56
> Cr-Commit-Position: refs/heads/master@{#338996}
TBR=jam@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=506255
Review URL: https://codereview.chromium.org/1233453011
Cr-Commit-Position: refs/heads/master@{#338998}
Diffstat (limited to 'third_party/zlib/google/zip_reader.cc')
-rw-r--r-- | third_party/zlib/google/zip_reader.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc index e0871c8..d3c2775 100644 --- a/third_party/zlib/google/zip_reader.cc +++ b/third_party/zlib/google/zip_reader.cc @@ -131,8 +131,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip, original_size_ = raw_file_info.uncompressed_size; // Directory entries in zip files end with "/". - is_directory_ = base::EndsWith(file_name_in_zip, "/", - base::CompareCase::INSENSITIVE_ASCII); + is_directory_ = base::EndsWith(file_name_in_zip, "/", false); // Check the file name here for directory traversal issues. is_unsafe_ = file_path_.ReferencesParent(); |