Commit 805eabb9 authored by viettrungluu's avatar viettrungluu Committed by Commit bot

Convert ARRAYSIZE_UNSAFE -> arraysize in base/.

R=thestig@chromium.org
BUG=423134

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

Cr-Commit-Position: refs/heads/master@{#299835}
parent 4b691586
...@@ -167,7 +167,7 @@ TEST(ProcMapsTest, Permissions) { ...@@ -167,7 +167,7 @@ TEST(ProcMapsTest, Permissions) {
MappedMemoryRegion::EXECUTE | MappedMemoryRegion::PRIVATE}, MappedMemoryRegion::EXECUTE | MappedMemoryRegion::PRIVATE},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) { for (size_t i = 0; i < arraysize(kTestCases); ++i) {
SCOPED_TRACE( SCOPED_TRACE(
base::StringPrintf("kTestCases[%zu] = %s", i, kTestCases[i].input)); base::StringPrintf("kTestCases[%zu] = %s", i, kTestCases[i].input));
......
...@@ -343,7 +343,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* info, void* void_context) { ...@@ -343,7 +343,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* info, void* void_context) {
const int kRegisterPadding = 16; const int kRegisterPadding = 16;
#endif #endif
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(registers); i++) { for (size_t i = 0; i < arraysize(registers); i++) {
PrintToStderr(registers[i].label); PrintToStderr(registers[i].label);
internal::itoa_r(registers[i].value, buf, sizeof(buf), internal::itoa_r(registers[i].value, buf, sizeof(buf),
16, kRegisterPadding); 16, kRegisterPadding);
......
...@@ -267,7 +267,7 @@ TEST_F(FileProxyTest, WriteAndFlush) { ...@@ -267,7 +267,7 @@ TEST_F(FileProxyTest, WriteAndFlush) {
CreateProxy(File::FLAG_CREATE | File::FLAG_WRITE, &proxy); CreateProxy(File::FLAG_CREATE | File::FLAG_WRITE, &proxy);
const char data[] = "foo!"; const char data[] = "foo!";
int data_bytes = ARRAYSIZE_UNSAFE(data); int data_bytes = arraysize(data);
proxy.Write(0, data, data_bytes, proxy.Write(0, data, data_bytes,
Bind(&FileProxyTest::DidWrite, weak_factory_.GetWeakPtr())); Bind(&FileProxyTest::DidWrite, weak_factory_.GetWeakPtr()));
MessageLoop::current()->Run(); MessageLoop::current()->Run();
......
...@@ -234,7 +234,7 @@ static const struct { ...@@ -234,7 +234,7 @@ static const struct {
}; };
TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) { TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertCodepageCases); ++i) { for (size_t i = 0; i < arraysize(kConvertCodepageCases); ++i) {
SCOPED_TRACE(base::StringPrintf( SCOPED_TRACE(base::StringPrintf(
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, "Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i,
kConvertCodepageCases[i].encoded, kConvertCodepageCases[i].encoded,
...@@ -301,7 +301,7 @@ TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) { ...@@ -301,7 +301,7 @@ TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndWide) {
} }
TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndUTF16) { TEST(ICUStringConversionsTest, ConvertBetweenCodepageAndUTF16) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertCodepageCases); ++i) { for (size_t i = 0; i < arraysize(kConvertCodepageCases); ++i) {
SCOPED_TRACE(base::StringPrintf( SCOPED_TRACE(base::StringPrintf(
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, "Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i,
kConvertCodepageCases[i].encoded, kConvertCodepageCases[i].encoded,
...@@ -355,7 +355,7 @@ static const struct { ...@@ -355,7 +355,7 @@ static const struct {
}; };
TEST(ICUStringConversionsTest, ConvertToUtf8AndNormalize) { TEST(ICUStringConversionsTest, ConvertToUtf8AndNormalize) {
std::string result; std::string result;
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kConvertAndNormalizeCases); ++i) { for (size_t i = 0; i < arraysize(kConvertAndNormalizeCases); ++i) {
SCOPED_TRACE(base::StringPrintf( SCOPED_TRACE(base::StringPrintf(
"Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i, "Test[%" PRIuS "]: <encoded: %s> <codepage: %s>", i,
kConvertAndNormalizeCases[i].encoded, kConvertAndNormalizeCases[i].encoded,
......
...@@ -27,7 +27,7 @@ TEST(NumberFormattingTest, FormatNumber) { ...@@ -27,7 +27,7 @@ TEST(NumberFormattingTest, FormatNumber) {
{-42, "-42", "-42"}, {-42, "-42", "-42"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
i18n::SetICUDefaultLocale("en"); i18n::SetICUDefaultLocale("en");
testing::ResetFormatters(); testing::ResetFormatters();
EXPECT_EQ(cases[i].expected_english, EXPECT_EQ(cases[i].expected_english,
...@@ -72,7 +72,7 @@ TEST(NumberFormattingTest, FormatDouble) { ...@@ -72,7 +72,7 @@ TEST(NumberFormattingTest, FormatDouble) {
{-42.7, 3, "-42.700", "-42,700"}, {-42.7, 3, "-42.700", "-42,700"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
i18n::SetICUDefaultLocale("en"); i18n::SetICUDefaultLocale("en");
testing::ResetFormatters(); testing::ResetFormatters();
EXPECT_EQ(cases[i].expected_english, EXPECT_EQ(cases[i].expected_english,
......
...@@ -96,7 +96,7 @@ TEST_F(RTLTest, GetFirstStrongCharacterDirection) { ...@@ -96,7 +96,7 @@ TEST_F(RTLTest, GetFirstStrongCharacterDirection) {
LEFT_TO_RIGHT }, LEFT_TO_RIGHT },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].direction, EXPECT_EQ(cases[i].direction,
GetFirstStrongCharacterDirection(WideToUTF16(cases[i].text))); GetFirstStrongCharacterDirection(WideToUTF16(cases[i].text)));
} }
...@@ -158,7 +158,7 @@ TEST_F(RTLTest, GetLastStrongCharacterDirection) { ...@@ -158,7 +158,7 @@ TEST_F(RTLTest, GetLastStrongCharacterDirection) {
LEFT_TO_RIGHT }, LEFT_TO_RIGHT },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].direction, EXPECT_EQ(cases[i].direction,
GetLastStrongCharacterDirection(WideToUTF16(cases[i].text))); GetLastStrongCharacterDirection(WideToUTF16(cases[i].text)));
} }
...@@ -236,7 +236,7 @@ TEST_F(RTLTest, GetStringDirection) { ...@@ -236,7 +236,7 @@ TEST_F(RTLTest, GetStringDirection) {
LEFT_TO_RIGHT }, LEFT_TO_RIGHT },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].direction, EXPECT_EQ(cases[i].direction,
GetStringDirection(WideToUTF16(cases[i].text))); GetStringDirection(WideToUTF16(cases[i].text)));
} }
...@@ -355,7 +355,7 @@ TEST_F(RTLTest, GetDisplayStringInLTRDirectionality) { ...@@ -355,7 +355,7 @@ TEST_F(RTLTest, GetDisplayStringInLTRDirectionality) {
for (size_t i = 0; i < 2; ++i) { for (size_t i = 0; i < 2; ++i) {
// Toggle the application default text direction (to try each direction). // Toggle the application default text direction (to try each direction).
SetRTL(!IsRTL()); SetRTL(!IsRTL());
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
string16 input = WideToUTF16(cases[i].path); string16 input = WideToUTF16(cases[i].path);
string16 output = GetDisplayStringInLTRDirectionality(input); string16 output = GetDisplayStringInLTRDirectionality(input);
// Test the expected wrapping behavior for the current UI directionality. // Test the expected wrapping behavior for the current UI directionality.
......
...@@ -23,7 +23,7 @@ TEST(JSONStringEscapeTest, EscapeUTF8) { ...@@ -23,7 +23,7 @@ TEST(JSONStringEscapeTest, EscapeUTF8) {
{"c<>d", "c\\u003C>d"}, {"c<>d", "c\\u003C>d"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
const char* in_ptr = cases[i].to_escape; const char* in_ptr = cases[i].to_escape;
std::string in_str = in_ptr; std::string in_str = in_ptr;
...@@ -81,7 +81,7 @@ TEST(JSONStringEscapeTest, EscapeUTF16) { ...@@ -81,7 +81,7 @@ TEST(JSONStringEscapeTest, EscapeUTF16) {
{L"c<>d", "c\\u003C>d"}, {L"c<>d", "c\\u003C>d"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
string16 in = WideToUTF16(cases[i].to_escape); string16 in = WideToUTF16(cases[i].to_escape);
std::string out; std::string out;
...@@ -162,7 +162,7 @@ TEST(JSONStringEscapeTest, EscapeBytes) { ...@@ -162,7 +162,7 @@ TEST(JSONStringEscapeTest, EscapeBytes) {
{"\xe5\xc4\x4f\x05\xb6\xfd\0", "\\u00E5\\u00C4O\\u0005\\u00B6\\u00FD"}, {"\xe5\xc4\x4f\x05\xb6\xfd\0", "\\u00E5\\u00C4O\\u0005\\u00B6\\u00FD"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
std::string in = std::string(cases[i].to_escape); std::string in = std::string(cases[i].to_escape);
EXPECT_FALSE(IsStringUTF8(in)); EXPECT_FALSE(IsStringUTF8(in));
...@@ -173,7 +173,7 @@ TEST(JSONStringEscapeTest, EscapeBytes) { ...@@ -173,7 +173,7 @@ TEST(JSONStringEscapeTest, EscapeBytes) {
} }
const char kEmbedNull[] = { '\xab', '\x39', '\0', '\x9f', '\xab' }; const char kEmbedNull[] = { '\xab', '\x39', '\0', '\x9f', '\xab' };
std::string in(kEmbedNull, ARRAYSIZE_UNSAFE(kEmbedNull)); std::string in(kEmbedNull, arraysize(kEmbedNull));
EXPECT_FALSE(IsStringUTF8(in)); EXPECT_FALSE(IsStringUTF8(in));
EXPECT_EQ(std::string("\\u00AB9\\u0000\\u009F\\u00AB"), EXPECT_EQ(std::string("\\u00AB9\\u0000\\u009F\\u00AB"),
EscapeBytesAsInvalidJSONString(in, false)); EscapeBytesAsInvalidJSONString(in, false));
......
...@@ -92,7 +92,7 @@ TEST_F(MacUtilTest, TestGetAppBundlePath) { ...@@ -92,7 +92,7 @@ TEST_F(MacUtilTest, TestGetAppBundlePath) {
{ "/Applications/Google Foo.app/bar/Foo Helper.app/quux/Foo Helper", { "/Applications/Google Foo.app/bar/Foo Helper.app/quux/Foo Helper",
"/Applications/Google Foo.app" }, "/Applications/Google Foo.app" },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(valid_inputs); i++) { for (size_t i = 0; i < arraysize(valid_inputs); i++) {
out = GetAppBundlePath(FilePath(valid_inputs[i].in)); out = GetAppBundlePath(FilePath(valid_inputs[i].in));
EXPECT_FALSE(out.empty()) << "loop: " << i; EXPECT_FALSE(out.empty()) << "loop: " << i;
EXPECT_STREQ(valid_inputs[i].expected_out, EXPECT_STREQ(valid_inputs[i].expected_out,
......
...@@ -963,7 +963,7 @@ TEST_F(FieldTrialTest, CreateSimulatedFieldTrial) { ...@@ -963,7 +963,7 @@ TEST_F(FieldTrialTest, CreateSimulatedFieldTrial) {
{ 0.95, kDefaultGroupName }, { 0.95, kDefaultGroupName },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { for (size_t i = 0; i < arraysize(test_cases); ++i) {
TestFieldTrialObserver observer; TestFieldTrialObserver observer;
scoped_refptr<FieldTrial> trial( scoped_refptr<FieldTrial> trial(
FieldTrial::CreateSimulatedFieldTrial(kTrialName, 100, kDefaultGroupName, FieldTrial::CreateSimulatedFieldTrial(kTrialName, 100, kDefaultGroupName,
......
...@@ -73,7 +73,7 @@ TEST(StringNumberConversionsTest, Uint64ToString) { ...@@ -73,7 +73,7 @@ TEST(StringNumberConversionsTest, Uint64ToString) {
{kuint64max, "18446744073709551615"}, {kuint64max, "18446744073709551615"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input)); EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input));
} }
...@@ -96,7 +96,7 @@ TEST(StringNumberConversionsTest, SizeTToString) { ...@@ -96,7 +96,7 @@ TEST(StringNumberConversionsTest, SizeTToString) {
{size_t_max, size_t_max_string}, {size_t_max, size_t_max_string},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input)); EXPECT_EQ(cases[i].output, Uint64ToString(cases[i].input));
} }
...@@ -132,7 +132,7 @@ TEST(StringNumberConversionsTest, StringToInt) { ...@@ -132,7 +132,7 @@ TEST(StringNumberConversionsTest, StringToInt) {
{"99999999999", INT_MAX, false}, {"99999999999", INT_MAX, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
int output = 0; int output = 0;
EXPECT_EQ(cases[i].success, StringToInt(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToInt(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -196,7 +196,7 @@ TEST(StringNumberConversionsTest, StringToUint) { ...@@ -196,7 +196,7 @@ TEST(StringNumberConversionsTest, StringToUint) {
{"99999999999", UINT_MAX, false}, {"99999999999", UINT_MAX, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
unsigned output = 0; unsigned output = 0;
EXPECT_EQ(cases[i].success, StringToUint(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToUint(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -266,7 +266,7 @@ TEST(StringNumberConversionsTest, StringToInt64) { ...@@ -266,7 +266,7 @@ TEST(StringNumberConversionsTest, StringToInt64) {
{"99999999999999999999", kint64max, false}, {"99999999999999999999", kint64max, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
int64 output = 0; int64 output = 0;
EXPECT_EQ(cases[i].success, StringToInt64(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToInt64(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -333,7 +333,7 @@ TEST(StringNumberConversionsTest, StringToUint64) { ...@@ -333,7 +333,7 @@ TEST(StringNumberConversionsTest, StringToUint64) {
{"18446744073709551616", kuint64max, false}, {"18446744073709551616", kuint64max, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
uint64 output = 0; uint64 output = 0;
EXPECT_EQ(cases[i].success, StringToUint64(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToUint64(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -402,7 +402,7 @@ TEST(StringNumberConversionsTest, StringToSizeT) { ...@@ -402,7 +402,7 @@ TEST(StringNumberConversionsTest, StringToSizeT) {
{size_t_max_string, size_t_max, true}, {size_t_max_string, size_t_max, true},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
size_t output = 0; size_t output = 0;
EXPECT_EQ(cases[i].success, StringToSizeT(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToSizeT(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -465,7 +465,7 @@ TEST(StringNumberConversionsTest, HexStringToInt) { ...@@ -465,7 +465,7 @@ TEST(StringNumberConversionsTest, HexStringToInt) {
{"0x", 0, false}, {"0x", 0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
int output = 0; int output = 0;
EXPECT_EQ(cases[i].success, HexStringToInt(cases[i].input, &output)); EXPECT_EQ(cases[i].success, HexStringToInt(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -525,7 +525,7 @@ TEST(StringNumberConversionsTest, HexStringToUInt) { ...@@ -525,7 +525,7 @@ TEST(StringNumberConversionsTest, HexStringToUInt) {
{"0x", 0, false}, {"0x", 0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
uint32 output = 0; uint32 output = 0;
EXPECT_EQ(cases[i].success, HexStringToUInt(cases[i].input, &output)); EXPECT_EQ(cases[i].success, HexStringToUInt(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -582,7 +582,7 @@ TEST(StringNumberConversionsTest, HexStringToInt64) { ...@@ -582,7 +582,7 @@ TEST(StringNumberConversionsTest, HexStringToInt64) {
{"0x", 0, false}, {"0x", 0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
int64 output = 0; int64 output = 0;
EXPECT_EQ(cases[i].success, HexStringToInt64(cases[i].input, &output)); EXPECT_EQ(cases[i].success, HexStringToInt64(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -644,7 +644,7 @@ TEST(StringNumberConversionsTest, HexStringToUInt64) { ...@@ -644,7 +644,7 @@ TEST(StringNumberConversionsTest, HexStringToUInt64) {
{"0x", 0, false}, {"0x", 0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
uint64 output = 0; uint64 output = 0;
EXPECT_EQ(cases[i].success, HexStringToUInt64(cases[i].input, &output)); EXPECT_EQ(cases[i].success, HexStringToUInt64(cases[i].input, &output));
EXPECT_EQ(cases[i].output, output); EXPECT_EQ(cases[i].output, output);
...@@ -686,7 +686,7 @@ TEST(StringNumberConversionsTest, HexStringToBytes) { ...@@ -686,7 +686,7 @@ TEST(StringNumberConversionsTest, HexStringToBytes) {
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
std::vector<uint8> output; std::vector<uint8> output;
std::vector<uint8> compare; std::vector<uint8> compare;
EXPECT_EQ(cases[i].success, HexStringToBytes(cases[i].input, &output)) << EXPECT_EQ(cases[i].success, HexStringToBytes(cases[i].input, &output)) <<
...@@ -735,7 +735,7 @@ TEST(StringNumberConversionsTest, StringToDouble) { ...@@ -735,7 +735,7 @@ TEST(StringNumberConversionsTest, StringToDouble) {
{"", 0.0, false}, {"", 0.0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
double output; double output;
errno = 1; errno = 1;
EXPECT_EQ(cases[i].success, StringToDouble(cases[i].input, &output)); EXPECT_EQ(cases[i].success, StringToDouble(cases[i].input, &output));
...@@ -768,7 +768,7 @@ TEST(StringNumberConversionsTest, DoubleToString) { ...@@ -768,7 +768,7 @@ TEST(StringNumberConversionsTest, DoubleToString) {
{1.33503e+009, "1335030000"}, {1.33503e+009, "1335030000"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
EXPECT_EQ(cases[i].expected, DoubleToString(cases[i].input)); EXPECT_EQ(cases[i].expected, DoubleToString(cases[i].input));
} }
......
...@@ -312,7 +312,7 @@ TEST(StringSplitTest, SplitStringAlongWhitespace) { ...@@ -312,7 +312,7 @@ TEST(StringSplitTest, SplitStringAlongWhitespace) {
{ "b\tat", 2, "b", "at" }, { "b\tat", 2, "b", "at" },
{ "b\t at", 2, "b", "at" }, { "b\t at", 2, "b", "at" },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { for (size_t i = 0; i < arraysize(data); ++i) {
std::vector<std::string> results; std::vector<std::string> results;
SplitStringAlongWhitespace(data[i].input, &results); SplitStringAlongWhitespace(data[i].input, &results);
ASSERT_EQ(data[i].expected_result_count, results.size()); ASSERT_EQ(data[i].expected_result_count, results.size());
......
...@@ -539,7 +539,7 @@ TEST(StringUtilTest, LowerCaseEqualsASCII) { ...@@ -539,7 +539,7 @@ TEST(StringUtilTest, LowerCaseEqualsASCII) {
{ "FOO", "foo" }, { "FOO", "foo" },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(lowercase_cases); ++i) { for (size_t i = 0; i < arraysize(lowercase_cases); ++i) {
EXPECT_TRUE(LowerCaseEqualsASCII(ASCIIToUTF16(lowercase_cases[i].src_a), EXPECT_TRUE(LowerCaseEqualsASCII(ASCIIToUTF16(lowercase_cases[i].src_a),
lowercase_cases[i].dst)); lowercase_cases[i].dst));
EXPECT_TRUE(LowerCaseEqualsASCII(lowercase_cases[i].src_a, EXPECT_TRUE(LowerCaseEqualsASCII(lowercase_cases[i].src_a,
...@@ -576,7 +576,7 @@ TEST(StringUtilTest, FormatBytesUnlocalized) { ...@@ -576,7 +576,7 @@ TEST(StringUtilTest, FormatBytesUnlocalized) {
{100LL*1024*1024*1024, "100 GB"}, {100LL*1024*1024*1024, "100 GB"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
EXPECT_EQ(ASCIIToUTF16(cases[i].expected), EXPECT_EQ(ASCIIToUTF16(cases[i].expected),
FormatBytesUnlocalized(cases[i].bytes)); FormatBytesUnlocalized(cases[i].bytes));
} }
...@@ -603,7 +603,7 @@ TEST(StringUtilTest, ReplaceSubstringsAfterOffset) { ...@@ -603,7 +603,7 @@ TEST(StringUtilTest, ReplaceSubstringsAfterOffset) {
{"abababab", 2, "ab", "c", "abccc"}, {"abababab", 2, "ab", "c", "abccc"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) { for (size_t i = 0; i < arraysize(cases); i++) {
string16 str = ASCIIToUTF16(cases[i].str); string16 str = ASCIIToUTF16(cases[i].str);
ReplaceSubstringsAfterOffset(&str, cases[i].start_offset, ReplaceSubstringsAfterOffset(&str, cases[i].start_offset,
ASCIIToUTF16(cases[i].find_this), ASCIIToUTF16(cases[i].find_this),
...@@ -633,7 +633,7 @@ TEST(StringUtilTest, ReplaceFirstSubstringAfterOffset) { ...@@ -633,7 +633,7 @@ TEST(StringUtilTest, ReplaceFirstSubstringAfterOffset) {
{"abababab", 2, "ab", "c", "abcabab"}, {"abababab", 2, "ab", "c", "abcabab"},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) { for (size_t i = 0; i < arraysize(cases); i++) {
string16 str = ASCIIToUTF16(cases[i].str); string16 str = ASCIIToUTF16(cases[i].str);
ReplaceFirstSubstringAfterOffset(&str, cases[i].start_offset, ReplaceFirstSubstringAfterOffset(&str, cases[i].start_offset,
ASCIIToUTF16(cases[i].find_this), ASCIIToUTF16(cases[i].find_this),
...@@ -1148,7 +1148,7 @@ TEST(StringUtilTest, WprintfFormatPortabilityTest) { ...@@ -1148,7 +1148,7 @@ TEST(StringUtilTest, WprintfFormatPortabilityTest) {
{ L"% 10s", false }, { L"% 10s", false },
{ L"% 10ls", true } { L"% 10ls", true }
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) for (size_t i = 0; i < arraysize(cases); ++i)
EXPECT_EQ(cases[i].portable, base::IsWprintfFormatPortable(cases[i].input)); EXPECT_EQ(cases[i].portable, base::IsWprintfFormatPortable(cases[i].input));
} }
...@@ -1191,7 +1191,7 @@ TEST(StringUtilTest, ReplaceChars) { ...@@ -1191,7 +1191,7 @@ TEST(StringUtilTest, ReplaceChars) {
{ "test", "t", "test", "testestest", true }, { "test", "t", "test", "testestest", true },
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
std::string output; std::string output;
bool result = ReplaceChars(cases[i].input, bool result = ReplaceChars(cases[i].input,
cases[i].replace_chars, cases[i].replace_chars,
......
...@@ -34,7 +34,7 @@ TEST(UTFOffsetStringConversionsTest, AdjustOffset) { ...@@ -34,7 +34,7 @@ TEST(UTFOffsetStringConversionsTest, AdjustOffset) {
{"A\xF0\x90\x8C\x80z", 6, 4}, {"A\xF0\x90\x8C\x80z", 6, 4},
{"A\xF0\x90\x8C\x80z", kNpos, kNpos}, {"A\xF0\x90\x8C\x80z", kNpos, kNpos},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(utf8_to_utf16_cases); ++i) { for (size_t i = 0; i < arraysize(utf8_to_utf16_cases); ++i) {
const size_t offset = utf8_to_utf16_cases[i].input_offset; const size_t offset = utf8_to_utf16_cases[i].input_offset;
std::vector<size_t> offsets; std::vector<size_t> offsets;
offsets.push_back(offset); offsets.push_back(offset);
...@@ -64,7 +64,7 @@ TEST(UTFOffsetStringConversionsTest, AdjustOffset) { ...@@ -64,7 +64,7 @@ TEST(UTFOffsetStringConversionsTest, AdjustOffset) {
{{'A', 0xd800, 0xdf00, 'z'}, 3, 5}, {{'A', 0xd800, 0xdf00, 'z'}, 3, 5},
{{'A', 0xd800, 0xdf00, 'z'}, 4, 6}, {{'A', 0xd800, 0xdf00, 'z'}, 4, 6},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(utf16_to_utf8_cases); ++i) { for (size_t i = 0; i < arraysize(utf16_to_utf8_cases); ++i) {
size_t offset = utf16_to_utf8_cases[i].input_offset; size_t offset = utf16_to_utf8_cases[i].input_offset;
std::vector<size_t> offsets; std::vector<size_t> offsets;
offsets.push_back(offset); offsets.push_back(offset);
......
...@@ -94,7 +94,7 @@ TEST(UTFStringConversionsTest, ConvertUTF8ToWide) { ...@@ -94,7 +94,7 @@ TEST(UTFStringConversionsTest, ConvertUTF8ToWide) {
#endif #endif
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(convert_cases); i++) { for (size_t i = 0; i < arraysize(convert_cases); i++) {
std::wstring converted; std::wstring converted;
EXPECT_EQ(convert_cases[i].success, EXPECT_EQ(convert_cases[i].success,
UTF8ToWide(convert_cases[i].utf8, UTF8ToWide(convert_cases[i].utf8,
...@@ -172,7 +172,7 @@ TEST(UTFStringConversionsTest, ConvertUTF32ToUTF8) { ...@@ -172,7 +172,7 @@ TEST(UTFStringConversionsTest, ConvertUTF32ToUTF8) {
{L"\xdc01Hello", "\xef\xbf\xbdHello", false}, {L"\xdc01Hello", "\xef\xbf\xbdHello", false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(convert_cases); i++) { for (size_t i = 0; i < arraysize(convert_cases); i++) {
std::string converted; std::string converted;
EXPECT_EQ(convert_cases[i].success, EXPECT_EQ(convert_cases[i].success,
WideToUTF8(convert_cases[i].utf32, WideToUTF8(convert_cases[i].utf32,
......
...@@ -150,7 +150,7 @@ size_t CancelableFileOperation(Function operation, ...@@ -150,7 +150,7 @@ size_t CancelableFileOperation(Function operation,
if (::GetLastError() == ERROR_IO_PENDING) { if (::GetLastError() == ERROR_IO_PENDING) {
HANDLE events[] = { io_event->handle(), cancel_event->handle() }; HANDLE events[] = { io_event->handle(), cancel_event->handle() };
const int wait_result = WaitForMultipleObjects( const int wait_result = WaitForMultipleObjects(
ARRAYSIZE_UNSAFE(events), events, FALSE, arraysize(events), events, FALSE,
timeout_in_ms == INFINITE ? timeout_in_ms == INFINITE ?
timeout_in_ms : timeout_in_ms :
static_cast<DWORD>( static_cast<DWORD>(
......
...@@ -53,7 +53,7 @@ TEST(VersionTest, GetVersionFromString) { ...@@ -53,7 +53,7 @@ TEST(VersionTest, GetVersionFromString) {
{"f.1", 0, false}, {"f.1", 0, false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
Version version(cases[i].input); Version version(cases[i].input);
EXPECT_EQ(cases[i].success, version.IsValid()); EXPECT_EQ(cases[i].success, version.IsValid());
if (cases[i].success) if (cases[i].success)
...@@ -78,7 +78,7 @@ TEST(VersionTest, Compare) { ...@@ -78,7 +78,7 @@ TEST(VersionTest, Compare) {
{"1.0.0", "1.0", 0}, {"1.0.0", "1.0", 0},
{"1.0.3", "1.0.20", -1}, {"1.0.3", "1.0.20", -1},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
Version lhs(cases[i].lhs); Version lhs(cases[i].lhs);
Version rhs(cases[i].rhs); Version rhs(cases[i].rhs);
EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) << EXPECT_EQ(lhs.CompareTo(rhs), cases[i].expected) <<
...@@ -108,7 +108,7 @@ TEST(VersionTest, CompareToWildcardString) { ...@@ -108,7 +108,7 @@ TEST(VersionTest, CompareToWildcardString) {
{"1.3.9", "1.3.*", 0}, {"1.3.9", "1.3.*", 0},
{"1.2.0.0.0.0", "1.2.*", 0}, {"1.2.0.0.0.0", "1.2.*", 0},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
const Version version(cases[i].lhs); const Version version(cases[i].lhs);
const int result = version.CompareToWildcardString(cases[i].rhs); const int result = version.CompareToWildcardString(cases[i].rhs);
EXPECT_EQ(result, cases[i].expected) << cases[i].lhs << "?" << cases[i].rhs; EXPECT_EQ(result, cases[i].expected) << cases[i].lhs << "?" << cases[i].rhs;
...@@ -132,7 +132,7 @@ TEST(VersionTest, IsValidWildcardString) { ...@@ -132,7 +132,7 @@ TEST(VersionTest, IsValidWildcardString) {
{"*", false}, {"*", false},
{"*.2", false}, {"*.2", false},
}; };
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
EXPECT_EQ(Version::IsValidWildcardString(cases[i].version), EXPECT_EQ(Version::IsValidWildcardString(cases[i].version),
cases[i].expected) << cases[i].version << "?" << cases[i].expected; cases[i].expected) << cases[i].version << "?" << cases[i].expected;
} }
......
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