diff options
Diffstat (limited to 'chromium/net/ftp/ftp_directory_listing_parser_vms.cc')
-rw-r--r-- | chromium/net/ftp/ftp_directory_listing_parser_vms.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/net/ftp/ftp_directory_listing_parser_vms.cc b/chromium/net/ftp/ftp_directory_listing_parser_vms.cc index 4b44d73b5b5..b52e3c807a6 100644 --- a/chromium/net/ftp/ftp_directory_listing_parser_vms.cc +++ b/chromium/net/ftp/ftp_directory_listing_parser_vms.cc @@ -54,7 +54,7 @@ bool ParseVmsFilename(const base::string16& raw_filename, } bool ParseVmsFilesize(const base::string16& input, int64* size) { - if (ContainsOnlyChars(input, ASCIIToUTF16("*"))) { + if (base::ContainsOnlyChars(input, base::ASCIIToUTF16("*"))) { // Response consisting of asterisks means unknown size. *size = -1; return true; @@ -141,7 +141,7 @@ bool LooksLikeVMSError(const base::string16& text) { }; for (size_t i = 0; i < arraysize(kPermissionDeniedMessages); i++) { - if (text.find(ASCIIToUTF16(kPermissionDeniedMessages[i])) != + if (text.find(base::ASCIIToUTF16(kPermissionDeniedMessages[i])) != base::string16::npos) return true; } @@ -210,7 +210,7 @@ bool ParseFtpDirectoryListingVms( if (lines[i].empty()) continue; - if (StartsWith(lines[i], ASCIIToUTF16("Total of "), true)) { + if (StartsWith(lines[i], base::ASCIIToUTF16("Total of "), true)) { // After the "total" line, all following lines must be empty. for (size_t j = i + 1; j < lines.size(); j++) if (!lines[j].empty()) @@ -230,7 +230,7 @@ bool ParseFtpDirectoryListingVms( } std::vector<base::string16> columns; - base::SplitString(CollapseWhitespace(lines[i], false), ' ', &columns); + base::SplitString(base::CollapseWhitespace(lines[i], false), ' ', &columns); if (columns.size() == 1) { // There can be no continuation if the current line is the last one. @@ -248,8 +248,8 @@ bool ParseFtpDirectoryListingVms( // Join the current and next line and split them into columns. base::SplitString( - CollapseWhitespace(lines[i - 1] + ASCIIToUTF16(" ") + lines[i], - false), + base::CollapseWhitespace( + lines[i - 1] + base::ASCIIToUTF16(" ") + lines[i], false), ' ', &columns); } |