Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/search_engines/template_url_unittest.cc

Issue 658993002: Convert ARRAYSIZE_UNSAFE -> arraysize in components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/search_engines/template_url_service_unittest.cc ('k') | components/signin/core/browser/signin_error_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/search_engines/template_url_unittest.cc
diff --git a/components/search_engines/template_url_unittest.cc b/components/search_engines/template_url_unittest.cc
index 063ac2396f31872fefc2c27a6e0e93d6dbfd71ca..555783289da16f74ac7686c37a0999b0143d68ce 100644
--- a/components/search_engines/template_url_unittest.cc
+++ b/components/search_engines/template_url_unittest.cc
@@ -62,7 +62,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTerms) {
{ "http://en.wikipedia.org/{searchTerms}", ASCIIToUTF16("wiki/?"),
"http://en.wikipedia.org/wiki/%3F" }
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(search_term_cases); ++i) {
+ for (size_t i = 0; i < arraysize(search_term_cases); ++i) {
const SearchTermsCase& value = search_term_cases[i];
TemplateURLData data;
data.SetURL(value.url);
@@ -303,7 +303,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTermsUsingTermsData) {
TestingSearchTermsData search_terms_data("http://example.com/e/");
TemplateURLData data;
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(search_term_cases); ++i) {
+ for (size_t i = 0; i < arraysize(search_term_cases); ++i) {
const SearchTermsCase& value = search_term_cases[i];
data.SetURL(value.url);
TemplateURL url(data);
@@ -344,7 +344,7 @@ TEST_F(TemplateURLTest, URLRefTermToWide) {
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(to_wide_cases); i++) {
+ for (size_t i = 0; i < arraysize(to_wide_cases); i++) {
EXPECT_EQ(to_wide_cases[i].expected_decoded_term,
url.url_ref().SearchTermToString16(
to_wide_cases[i].encoded_search_term));
@@ -366,7 +366,7 @@ TEST_F(TemplateURLTest, DisplayURLToURLRef) {
ASCIIToUTF16("http://foo%s{language}") },
};
TemplateURLData data;
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_EQ(test_data[i].expected_result,
@@ -409,7 +409,7 @@ TEST_F(TemplateURLTest, ReplaceSearchTerms) {
};
TemplateURLData data;
data.input_encodings.push_back("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
@@ -449,7 +449,7 @@ TEST_F(TemplateURLTest, ReplaceArbitrarySearchTerms) {
"http://foo/%82%A0%20%82%A2/bar"},
};
TemplateURLData data;
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
data.input_encodings.clear();
data.input_encodings.push_back(test_data[i].encoding);
@@ -506,7 +506,7 @@ TEST_F(TemplateURLTest, ReplaceAssistedQueryStats) {
};
TemplateURLData data;
data.input_encodings.push_back("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
@@ -544,7 +544,7 @@ TEST_F(TemplateURLTest, ReplaceCursorPosition) {
};
TemplateURLData data;
data.input_encodings.push_back("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
@@ -581,7 +581,7 @@ TEST_F(TemplateURLTest, ReplaceInputType) {
};
TemplateURLData data;
data.input_encodings.push_back("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
@@ -618,7 +618,7 @@ TEST_F(TemplateURLTest, ReplaceCurrentPageUrl) {
};
TemplateURLData data;
data.input_encodings.push_back("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
data.SetURL(test_data[i].url);
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
@@ -655,7 +655,7 @@ TEST_F(TemplateURLTest, OmniboxStartmargin) {
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foobar"));
search_terms_args.enable_omnibox_start_margin =
test_data[i].enable_omnibox_start_margin;
@@ -692,7 +692,7 @@ TEST_F(TemplateURLTest, Suggestions) {
TemplateURL url(data);
EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
TemplateURLRef::SearchTermsArgs search_terms_args(
ASCIIToUTF16("foobar"));
search_terms_args.accepted_suggestion = test_data[i].accepted_suggestion;
@@ -764,7 +764,7 @@ TEST_F(TemplateURLTest, HostAndSearchTermKey) {
{ "http://blah/?q=stock:{searchTerms}", "blah", "/", "q"},
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
TemplateURLData data;
data.SetURL(test_data[i].url);
TemplateURL url(data);
@@ -787,7 +787,7 @@ TEST_F(TemplateURLTest, GoogleBaseSuggestURL) {
{ "http://google.com/intl/xx/", "http://google.com/complete/", },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
+ for (size_t i = 0; i < arraysize(data); ++i)
CheckSuggestBaseURL(data[i].base_url, data[i].base_suggest_url);
}
@@ -1341,7 +1341,7 @@ TEST_F(TemplateURLTest, IsSearchResults) {
{ "http://bar/newtab", false, },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_data); ++i) {
+ for (size_t i = 0; i < arraysize(url_data); ++i) {
EXPECT_EQ(url_data[i].result,
search_provider.IsSearchURL(GURL(url_data[i].url),
search_terms_data_));
@@ -1471,7 +1471,7 @@ TEST_F(TemplateURLTest, GenerateSearchURL) {
"http://foo/blah.blah.blah.blah.blah" }
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generate_url_cases); ++i) {
+ for (size_t i = 0; i < arraysize(generate_url_cases); ++i) {
TemplateURLData data;
data.SetURL(generate_url_cases[i].url);
TemplateURL t_url(data);
« no previous file with comments | « components/search_engines/template_url_service_unittest.cc ('k') | components/signin/core/browser/signin_error_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698