Skip to content

Commit 5accd24

Browse files
Brett WilsonCommit Bot
Brett Wilson
authored and
Commit Bot
committedNov 30, 2017
Remove base::SizeToToString[16]
Convert to overloaded variant base::NumberToString Add SECURITY_OWNERS owner for components/network_hints/common/network_hints_messages.cc Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel Change-Id: I1bae6619c1da5c1cf32cbbdc2fe82946e355d74f Reviewed-on: https://chromium-review.googlesource.com/799550 Commit-Queue: Brett Wilson <[email protected]> Reviewed-by: Will Harris <[email protected]> Reviewed-by: Brett Wilson <[email protected]> Reviewed-by: Daniel Cheng <[email protected]> Cr-Commit-Position: refs/heads/master@{#520710}
1 parent 38f08f4 commit 5accd24

File tree

91 files changed

+239
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+239
-241
lines changed
 

‎base/strings/string_number_conversions.h

-6
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ inline std::string Uint64ToString(uint64_t value) {
9191
inline string16 Uint64ToString16(uint64_t value) {
9292
return NumberToString16(value);
9393
}
94-
inline std::string SizeTToString(size_t value) {
95-
return NumberToString(value);
96-
}
97-
inline string16 SizeTToString16(size_t value) {
98-
return NumberToString16(value);
99-
}
10094
inline std::string DoubleToString(double value) {
10195
return NumberToString(value);
10296
}

‎chrome/browser/autocomplete/search_provider_unittest.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -488,14 +488,14 @@ void SearchProviderTest::CheckMatches(const std::string& description,
488488
SCOPED_TRACE(description);
489489
// Ensure that the returned matches equal the expectations.
490490
for (; i < matches.size(); ++i) {
491-
SCOPED_TRACE(" Case # " + base::SizeTToString(i));
491+
SCOPED_TRACE(" Case # " + base::NumberToString(i));
492492
EXPECT_EQ(ASCIIToUTF16(expected_matches[i].contents), matches[i].contents);
493493
EXPECT_EQ(expected_matches[i].allowed_to_be_default_match,
494494
matches[i].allowed_to_be_default_match);
495495
}
496496
// Ensure that no expected matches are missing.
497497
for (; i < num_expected_matches; ++i) {
498-
SCOPED_TRACE(" Case # " + base::SizeTToString(i));
498+
SCOPED_TRACE(" Case # " + base::NumberToString(i));
499499
EXPECT_EQ(kNotApplicable, expected_matches[i].contents);
500500
}
501501
}
@@ -1976,7 +1976,7 @@ TEST_F(SearchProviderTest, KeywordFetcherSuggestRelevance) {
19761976
}
19771977
// Ensure that no expected matches are missing.
19781978
for (; j < arraysize(cases[i].matches); ++j) {
1979-
SCOPED_TRACE(" Case # " + base::SizeTToString(i));
1979+
SCOPED_TRACE(" Case # " + base::NumberToString(i));
19801980
EXPECT_EQ(kNotApplicable, cases[i].matches[j].contents);
19811981
}
19821982
}
@@ -2879,7 +2879,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) {
28792879
// Ensure that the returned matches equal the expectations.
28802880
for (; j < matches.size(); ++j) {
28812881
const Match& match = cases[i].matches[j];
2882-
SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
2882+
SCOPED_TRACE(" and match index: " + base::NumberToString(j));
28832883
EXPECT_EQ(match.contents,
28842884
base::UTF16ToUTF8(matches[j].contents));
28852885
EXPECT_EQ(match.description,
@@ -2892,7 +2892,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) {
28922892
}
28932893
// Ensure that no expected matches are missing.
28942894
for (; j < arraysize(cases[i].matches); ++j) {
2895-
SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
2895+
SCOPED_TRACE(" and match index: " + base::NumberToString(j));
28962896
EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable);
28972897
EXPECT_EQ(cases[i].matches[j].description, kNotApplicable);
28982898
EXPECT_EQ(cases[i].matches[j].query_params, kNotApplicable);
@@ -3098,18 +3098,18 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_ValidResponses) {
30983098
ASSERT_FALSE(matches.empty());
30993099
EXPECT_GE(matches[0].relevance, 1300);
31003100

3101-
SCOPED_TRACE("for case: " + base::SizeTToString(i));
3101+
SCOPED_TRACE("for case: " + base::NumberToString(i));
31023102
ASSERT_LE(matches.size(), arraysize(cases[i].matches));
31033103
size_t j = 0;
31043104
// Ensure that the returned matches equal the expectations.
31053105
for (; j < matches.size(); ++j) {
3106-
SCOPED_TRACE("and match: " + base::SizeTToString(j));
3106+
SCOPED_TRACE("and match: " + base::NumberToString(j));
31073107
EXPECT_EQ(cases[i].matches[j].contents,
31083108
base::UTF16ToUTF8(matches[j].contents));
31093109
EXPECT_EQ(cases[i].matches[j].type, matches[j].type);
31103110
}
31113111
for (; j < arraysize(cases[i].matches); ++j) {
3112-
SCOPED_TRACE("and match: " + base::SizeTToString(j));
3112+
SCOPED_TRACE("and match: " + base::NumberToString(j));
31133113
EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable);
31143114
EXPECT_EQ(cases[i].matches[j].type, AutocompleteMatchType::NUM_TYPES);
31153115
}
@@ -3206,7 +3206,7 @@ TEST_F(SearchProviderTest, ParseDeletionUrl) {
32063206

32073207
for (size_t j = 0; j < matches.size(); ++j) {
32083208
const Match& match = cases[i].matches[j];
3209-
SCOPED_TRACE(" and match index: " + base::SizeTToString(j));
3209+
SCOPED_TRACE(" and match index: " + base::NumberToString(j));
32103210
EXPECT_EQ(match.contents, base::UTF16ToUTF8(matches[j].contents));
32113211
EXPECT_EQ(match.deletion_url, matches[j].GetAdditionalInfo(
32123212
"deletion_url"));

0 commit comments

Comments
 (0)
Please sign in to comment.