diff options
| author | viettrungluu <viettrungluu@chromium.org> | 2014-10-15 20:42:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 03:43:02 +0000 |
| commit | 4b691586093fae3feb41fa39e345c42a4ce66932 (patch) | |
| tree | e881216c919cbc47706bce5a9ed72456985c997e /url/url_canon_icu_unittest.cc | |
| parent | 19a96cb5b687e580bd3bda348a47255394da7826 (diff) | |
| download | chromium_src-4b691586093fae3feb41fa39e345c42a4ce66932.zip chromium_src-4b691586093fae3feb41fa39e345c42a4ce66932.tar.gz chromium_src-4b691586093fae3feb41fa39e345c42a4ce66932.tar.bz2 | |
Convert ARRAYSIZE_UNSAFE -> arraysize in url/.
R=brettw@chromium.org
BUG=423134
Review URL: https://codereview.chromium.org/654303003
Cr-Commit-Position: refs/heads/master@{#299834}
Diffstat (limited to 'url/url_canon_icu_unittest.cc')
| -rw-r--r-- | url/url_canon_icu_unittest.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/url/url_canon_icu_unittest.cc b/url/url_canon_icu_unittest.cc index b28c30a..12b7ded 100644 --- a/url/url_canon_icu_unittest.cc +++ b/url/url_canon_icu_unittest.cc @@ -10,13 +10,6 @@ #include "url/url_canon_stdstring.h" #include "url/url_test_utils.h" -// Some implementations of base/basictypes.h may define ARRAYSIZE. -// If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro -// which is in our version of basictypes.h. -#ifndef ARRAYSIZE -#define ARRAYSIZE ARRAYSIZE_UNSAFE -#endif - namespace url { using test_utils::WStringToUTF16; @@ -61,7 +54,7 @@ TEST(URLCanonIcuTest, ICUCharsetConverter) { "hello\xa7\x41%26%231758%3B\xa6\x6eworld"}, }; - for (size_t i = 0; i < ARRAYSIZE(icu_cases); i++) { + for (size_t i = 0; i < arraysize(icu_cases); i++) { UConvScoper conv(icu_cases[i].encoding); ASSERT_TRUE(conv.converter() != NULL); ICUCharsetConverter converter(conv.converter()); @@ -118,7 +111,7 @@ TEST(URLCanonIcuTest, QueryWithConverter) { "?q=Chinese%26%2365319%3B"}, }; - for (size_t i = 0; i < ARRAYSIZE(query_cases); i++) { + for (size_t i = 0; i < arraysize(query_cases); i++) { Component out_comp; UConvScoper conv(query_cases[i].encoding); |