Commit 6eebf52c authored by viettrungluu's avatar viettrungluu Committed by Commit bot

Convert ARRAYSIZE_UNSAFE -> arraysize in extensions/.

R=finnur@chromium.org
BUG=423134

Review URL: https://codereview.chromium.org/660703002

Cr-Commit-Position: refs/heads/master@{#299888}
parent 8150c2c4
...@@ -422,7 +422,7 @@ TEST_F(FileUtilTest, ExtensionURLToRelativeFilePath) { ...@@ -422,7 +422,7 @@ TEST_F(FileUtilTest, ExtensionURLToRelativeFilePath) {
}; };
#undef URL_PREFIX #undef URL_PREFIX
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { for (size_t i = 0; i < arraysize(test_cases); ++i) {
GURL url(test_cases[i].url); GURL url(test_cases[i].url);
base::FilePath expected_path = base::FilePath expected_path =
base::FilePath::FromUTF8Unsafe(test_cases[i].expected_relative_path); base::FilePath::FromUTF8Unsafe(test_cases[i].expected_relative_path);
...@@ -487,7 +487,7 @@ TEST_F(FileUtilTest, ExtensionResourceURLToFilePath) { ...@@ -487,7 +487,7 @@ TEST_F(FileUtilTest, ExtensionResourceURLToFilePath) {
#undef SEP #undef SEP
#undef URL_PREFIX #undef URL_PREFIX
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { for (size_t i = 0; i < arraysize(test_cases); ++i) {
GURL url(test_cases[i].url); GURL url(test_cases[i].url);
base::FilePath expected_path; base::FilePath expected_path;
if (test_cases[i].expected_path) if (test_cases[i].expected_path)
......
...@@ -96,7 +96,7 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions() ...@@ -96,7 +96,7 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
}; };
std::vector<APIPermissionInfo*> permissions; std::vector<APIPermissionInfo*> permissions;
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(permissions_to_register); ++i) for (size_t i = 0; i < arraysize(permissions_to_register); ++i)
permissions.push_back(new APIPermissionInfo(permissions_to_register[i])); permissions.push_back(new APIPermissionInfo(permissions_to_register[i]));
return permissions; return permissions;
} }
......
...@@ -39,7 +39,7 @@ TEST(ExtensionURLPatternTest, ParseInvalid) { ...@@ -39,7 +39,7 @@ TEST(ExtensionURLPatternTest, ParseInvalid) {
{ "http://bar", URLPattern::PARSE_ERROR_EMPTY_PATH }, { "http://bar", URLPattern::PARSE_ERROR_EMPTY_PATH },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kInvalidPatterns); ++i) { for (size_t i = 0; i < arraysize(kInvalidPatterns); ++i) {
URLPattern pattern(URLPattern::SCHEME_ALL); URLPattern pattern(URLPattern::SCHEME_ALL);
EXPECT_EQ(kInvalidPatterns[i].expected_result, EXPECT_EQ(kInvalidPatterns[i].expected_result,
pattern.Parse(kInvalidPatterns[i].pattern)) pattern.Parse(kInvalidPatterns[i].pattern))
...@@ -82,7 +82,7 @@ TEST(ExtensionURLPatternTest, Ports) { ...@@ -82,7 +82,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" }, { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) { for (size_t i = 0; i < arraysize(kTestPatterns); ++i) {
URLPattern pattern(URLPattern::SCHEME_ALL); URLPattern pattern(URLPattern::SCHEME_ALL);
EXPECT_EQ(kTestPatterns[i].expected_result, EXPECT_EQ(kTestPatterns[i].expected_result,
pattern.Parse(kTestPatterns[i].pattern)) pattern.Parse(kTestPatterns[i].pattern))
...@@ -663,7 +663,7 @@ TEST(ExtensionURLPatternTest, Equals) { ...@@ -663,7 +663,7 @@ TEST(ExtensionURLPatternTest, Equals) {
} }
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEqualsTestCases); ++i) { for (size_t i = 0; i < arraysize(kEqualsTestCases); ++i) {
std::string message = kEqualsTestCases[i].pattern1; std::string message = kEqualsTestCases[i].pattern1;
message += " "; message += " ";
message += kEqualsTestCases[i].pattern2; message += kEqualsTestCases[i].pattern2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment