Index: chrome/browser/autocomplete/search_provider_unittest.cc |
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc |
index c58cd3375367a2b7ef20bf7f36792af4626a72e0..22dd22e9437a5cc35bfb21ee8fe1ba7702b635a7 100644 |
--- a/chrome/browser/autocomplete/search_provider_unittest.cc |
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc |
@@ -527,14 +527,14 @@ void SearchProviderTest::CheckMatches(const std::string& description, |
SCOPED_TRACE(description); |
// Ensure that the returned matches equal the expectations. |
for (; i < matches.size(); ++i) { |
- SCOPED_TRACE(" Case # " + base::IntToString(i)); |
+ SCOPED_TRACE(" Case # " + base::SizeTToString(i)); |
EXPECT_EQ(ASCIIToUTF16(expected_matches[i].contents), matches[i].contents); |
EXPECT_EQ(expected_matches[i].allowed_to_be_default_match, |
matches[i].allowed_to_be_default_match); |
} |
// Ensure that no expected matches are missing. |
for (; i < num_expected_matches; ++i) { |
- SCOPED_TRACE(" Case # " + base::IntToString(i)); |
+ SCOPED_TRACE(" Case # " + base::SizeTToString(i)); |
EXPECT_EQ(kNotApplicable, expected_matches[i].contents); |
} |
} |
@@ -2066,7 +2066,7 @@ TEST_F(SearchProviderTest, KeywordFetcherSuggestRelevance) { |
} |
// Ensure that no expected matches are missing. |
for (; j < arraysize(cases[i].matches); ++j) { |
- SCOPED_TRACE(" Case # " + base::IntToString(i)); |
+ SCOPED_TRACE(" Case # " + base::SizeTToString(i)); |
EXPECT_EQ(kNotApplicable, cases[i].matches[j].contents); |
} |
} |
@@ -2848,7 +2848,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) { |
// Ensure that the returned matches equal the expectations. |
for (; j < matches.size(); ++j) { |
const Match& match = cases[i].matches[j]; |
- SCOPED_TRACE(" and match index: " + base::IntToString(j)); |
+ SCOPED_TRACE(" and match index: " + base::SizeTToString(j)); |
EXPECT_EQ(match.contents, |
base::UTF16ToUTF8(matches[j].contents)); |
EXPECT_EQ(match.description, |
@@ -2861,7 +2861,7 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) { |
} |
// Ensure that no expected matches are missing. |
for (; j < arraysize(cases[i].matches); ++j) { |
- SCOPED_TRACE(" and match index: " + base::IntToString(j)); |
+ SCOPED_TRACE(" and match index: " + base::SizeTToString(j)); |
EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable); |
EXPECT_EQ(cases[i].matches[j].description, kNotApplicable); |
EXPECT_EQ(cases[i].matches[j].query_params, kNotApplicable); |
@@ -3068,18 +3068,18 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_ValidResponses) { |
ASSERT_FALSE(matches.empty()); |
EXPECT_GE(matches[0].relevance, 1300); |
- SCOPED_TRACE("for case: " + base::IntToString(i)); |
+ SCOPED_TRACE("for case: " + base::SizeTToString(i)); |
ASSERT_LE(matches.size(), arraysize(cases[i].matches)); |
size_t j = 0; |
// Ensure that the returned matches equal the expectations. |
for (; j < matches.size(); ++j) { |
- SCOPED_TRACE("and match: " + base::IntToString(j)); |
+ SCOPED_TRACE("and match: " + base::SizeTToString(j)); |
EXPECT_EQ(cases[i].matches[j].contents, |
base::UTF16ToUTF8(matches[j].contents)); |
EXPECT_EQ(cases[i].matches[j].type, matches[j].type); |
} |
for (; j < arraysize(cases[i].matches); ++j) { |
- SCOPED_TRACE("and match: " + base::IntToString(j)); |
+ SCOPED_TRACE("and match: " + base::SizeTToString(j)); |
EXPECT_EQ(cases[i].matches[j].contents, kNotApplicable); |
EXPECT_EQ(cases[i].matches[j].type, AutocompleteMatchType::NUM_TYPES); |
} |
@@ -3176,7 +3176,7 @@ TEST_F(SearchProviderTest, ParseDeletionUrl) { |
for (size_t j = 0; j < matches.size(); ++j) { |
const Match& match = cases[i].matches[j]; |
- SCOPED_TRACE(" and match index: " + base::IntToString(j)); |
+ SCOPED_TRACE(" and match index: " + base::SizeTToString(j)); |
EXPECT_EQ(match.contents, base::UTF16ToUTF8(matches[j].contents)); |
EXPECT_EQ(match.deletion_url, matches[j].GetAdditionalInfo( |
"deletion_url")); |