diff options
author | viettrungluu <viettrungluu@chromium.org> | 2014-10-15 23:17:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 06:17:55 +0000 |
commit | e4a8b88dc0d38b5ee9a4fb6bde499c404a741f84 (patch) | |
tree | 9043e72ec083abbe5a0245f4e8668883378d024f /net/base/escape.cc | |
parent | 69be8769ba99c7cee59b32ec95ae4c7a4849e1a3 (diff) | |
download | chromium_src-e4a8b88dc0d38b5ee9a4fb6bde499c404a741f84.zip chromium_src-e4a8b88dc0d38b5ee9a4fb6bde499c404a741f84.tar.gz chromium_src-e4a8b88dc0d38b5ee9a4fb6bde499c404a741f84.tar.bz2 |
Convert ARRAYSIZE_UNSAFE -> arraysize in net/.
R=rsleevi@chromium.org
BUG=423134
Review URL: https://codereview.chromium.org/662553002
Cr-Commit-Position: refs/heads/master@{#299857}
Diffstat (limited to 'net/base/escape.cc')
-rw-r--r-- | net/base/escape.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/base/escape.cc b/net/base/escape.cc index 7ce21a1..1798b6c 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -244,7 +244,7 @@ void AppendEscapedCharForHTMLImpl(typename str::value_type c, str* output) { { '\'', "'" }, }; size_t k; - for (k = 0; k < ARRAYSIZE_UNSAFE(kCharsToEscape); ++k) { + for (k = 0; k < arraysize(kCharsToEscape); ++k) { if (c == kCharsToEscape[k].key) { const char* p = kCharsToEscape[k].replacement; while (*p) @@ -252,7 +252,7 @@ void AppendEscapedCharForHTMLImpl(typename str::value_type c, str* output) { break; } } - if (k == ARRAYSIZE_UNSAFE(kCharsToEscape)) + if (k == arraysize(kCharsToEscape)) output->push_back(c); } @@ -385,14 +385,14 @@ base::string16 UnescapeForHTML(const base::string16& input) { if (input.find(base::ASCIIToUTF16("&")) == std::string::npos) return input; - base::string16 ampersand_chars[ARRAYSIZE_UNSAFE(kEscapeToChars)]; + base::string16 ampersand_chars[arraysize(kEscapeToChars)]; base::string16 text(input); for (base::string16::iterator iter = text.begin(); iter != text.end(); ++iter) { if (*iter == '&') { // Potential ampersand encode char. size_t index = iter - text.begin(); - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEscapeToChars); i++) { + for (size_t i = 0; i < arraysize(kEscapeToChars); i++) { if (ampersand_chars[i].empty()) { ampersand_chars[i] = base::ASCIIToUTF16(kEscapeToChars[i].ampersand_code); |