summaryrefslogtreecommitdiffstats
path: root/components/query_parser
diff options
context:
space:
mode:
authorviettrungluu <viettrungluu@chromium.org>2014-10-16 11:23:27 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-16 18:24:13 +0000
commit37a447b86b8ac98c5827701e765de9558c6c50e7 (patch)
treee413b48d7cd1a4e91d9b701e691ad8e6554f18d5 /components/query_parser
parentac59b2cc31ddb0bf15074e6253fbf73196a39d69 (diff)
downloadchromium_src-37a447b86b8ac98c5827701e765de9558c6c50e7.zip
chromium_src-37a447b86b8ac98c5827701e765de9558c6c50e7.tar.gz
chromium_src-37a447b86b8ac98c5827701e765de9558c6c50e7.tar.bz2
Convert ARRAYSIZE_UNSAFE -> arraysize in components/.
BUG=423134 Review URL: https://codereview.chromium.org/658993002 Cr-Commit-Position: refs/heads/master@{#299934}
Diffstat (limited to 'components/query_parser')
-rw-r--r--components/query_parser/query_parser_unittest.cc4
-rw-r--r--components/query_parser/snippet_unittest.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/components/query_parser/query_parser_unittest.cc b/components/query_parser/query_parser_unittest.cc
index 0ec1412..d78a8fc 100644
--- a/components/query_parser/query_parser_unittest.cc
+++ b/components/query_parser/query_parser_unittest.cc
@@ -116,7 +116,7 @@ TEST_F(QueryParserTest, ParseQueryNodesAndMatch) {
{ "\"foo blah\"", "\"foo blah\"", true, 1, 9, 0, 0 },
{ "foo blah", "\"foo bar blah\"", true, 1, 4, 9, 13 },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+ for (size_t i = 0; i < arraysize(data); ++i) {
QueryParser parser;
ScopedVector<QueryNode> query_nodes;
parser.ParseQueryNodes(base::UTF8ToUTF16(data[i].query),
@@ -154,7 +154,7 @@ TEST_F(QueryParserTest, ParseQueryWords) {
{ "\"foo bar\"", "foo", "bar", "", 2 },
{ "\"foo bar\" a", "foo", "bar", "a", 3 },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+ for (size_t i = 0; i < arraysize(data); ++i) {
std::vector<base::string16> results;
QueryParser parser;
parser.ParseQueryWords(base::UTF8ToUTF16(data[i].text), &results);
diff --git a/components/query_parser/snippet_unittest.cc b/components/query_parser/snippet_unittest.cc
index c409415..7f96f67 100644
--- a/components/query_parser/snippet_unittest.cc
+++ b/components/query_parser/snippet_unittest.cc
@@ -241,7 +241,7 @@ TEST(Snippets, ExtractMatchPositions) {
{ "0 0 1 2 0 0 1 1", 1, { 1, 3 } },
{ "0 0 1 1 0 0 5 2 0 0 10 1 0 0 3 10", 2, { 1, 2, 3, 13 } },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+ for (size_t i = 0; i < arraysize(data); ++i) {
Snippet::MatchPositions matches;
Snippet::ExtractMatchPositions(data[i].offsets_string, "0", &matches);
EXPECT_EQ(data[i].expected_match_count, matches.size());