Commit 7bad6d65 authored by Raul Tambre's avatar Raul Tambre Committed by Commit Bot

//ios: Convert base::(U)Int(64)ToString(16) to NumberToString(16)

The former non-overloaded variants are deprecated.

This is a mechanical change; there is no intended behavior change.

Bug: 929827
Change-Id: I1df4a9aee87ddc94dcfed52ae6bc8b595eff8dc0
Reviewed-on: https://chromium-review.googlesource.com/c/1461038
Auto-Submit: Raul Tambre <raul@tambre.ee>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630722}
parent 06acaf72
...@@ -135,8 +135,8 @@ UILabel* TextLabel(NSString* text, CGFloat alpha, BOOL bold) { ...@@ -135,8 +135,8 @@ UILabel* TextLabel(NSString* text, CGFloat alpha, BOOL bold) {
base::SysNSStringToUTF16(suggestion.value), base::SysNSStringToUTF16(suggestion.value),
base::SysNSStringToUTF16( base::SysNSStringToUTF16(
suggestion.displayDescription), suggestion.displayDescription),
base::IntToString16(index + 1), base::NumberToString16(index + 1),
base::IntToString16(numSuggestions))]; base::NumberToString16(numSuggestions))];
[self [self
setAccessibilityIdentifier:kFormSuggestionLabelAccessibilityIdentifier]; setAccessibilityIdentifier:kFormSuggestionLabelAccessibilityIdentifier];
} }
......
...@@ -147,7 +147,7 @@ void NotificationPromo::WritePrefs(int promo_id, ...@@ -147,7 +147,7 @@ void NotificationPromo::WritePrefs(int promo_id,
base::DictionaryValue promo_dict; base::DictionaryValue promo_dict;
promo_dict.MergeDictionary(local_state_->GetDictionary(kPrefPromoObject)); promo_dict.MergeDictionary(local_state_->GetDictionary(kPrefPromoObject));
promo_dict.Set(base::IntToString(promo_id), std::move(ntp_promo)); promo_dict.Set(base::NumberToString(promo_id), std::move(ntp_promo));
local_state_->Set(kPrefPromoObject, promo_dict); local_state_->Set(kPrefPromoObject, promo_dict);
DVLOG(1) << "WritePrefs " << promo_dict; DVLOG(1) << "WritePrefs " << promo_dict;
} }
...@@ -163,7 +163,7 @@ void NotificationPromo::InitFromPrefs() { ...@@ -163,7 +163,7 @@ void NotificationPromo::InitFromPrefs() {
return; return;
const base::DictionaryValue* ntp_promo = NULL; const base::DictionaryValue* ntp_promo = NULL;
promo_dict->GetDictionary(base::IntToString(promo_id_), &ntp_promo); promo_dict->GetDictionary(base::NumberToString(promo_id_), &ntp_promo);
if (!ntp_promo) if (!ntp_promo)
return; return;
......
...@@ -95,9 +95,9 @@ class NotificationPromoTest : public PlatformTest { ...@@ -95,9 +95,9 @@ class NotificationPromoTest : public PlatformTest {
field_trial_params["start"] = start_param; field_trial_params["start"] = start_param;
field_trial_params["end"] = year_from_now_string; field_trial_params["end"] = year_from_now_string;
field_trial_params["promo_text"] = promo_text; field_trial_params["promo_text"] = promo_text;
field_trial_params["max_views"] = base::IntToString(max_views); field_trial_params["max_views"] = base::NumberToString(max_views);
field_trial_params["max_seconds"] = base::IntToString(max_seconds); field_trial_params["max_seconds"] = base::NumberToString(max_seconds);
field_trial_params["promo_id"] = base::IntToString(promo_id); field_trial_params["promo_id"] = base::NumberToString(promo_id);
// Payload parameters. // Payload parameters.
base::DictionaryValue* payload; base::DictionaryValue* payload;
test_json_->GetDictionary("payload", &payload); test_json_->GetDictionary("payload", &payload);
......
...@@ -191,8 +191,8 @@ const std::string kFindInPageResponse = "Find in page. Find in page."; ...@@ -191,8 +191,8 @@ const std::string kFindInPageResponse = "Find in page. Find in page.";
outOfTotal:(int)resultCount { outOfTotal:(int)resultCount {
// Returns "<current> of <total>" search results label (e.g "1 of 5"). // Returns "<current> of <total>" search results label (e.g "1 of 5").
NSString* expectedResultsString = l10n_util::GetNSStringF( NSString* expectedResultsString = l10n_util::GetNSStringF(
IDS_FIND_IN_PAGE_COUNT, base::IntToString16(resultIndex), IDS_FIND_IN_PAGE_COUNT, base::NumberToString16(resultIndex),
base::IntToString16(resultCount)); base::NumberToString16(resultCount));
ConditionBlock condition = ^{ ConditionBlock condition = ^{
NSError* error = nil; NSError* error = nil;
......
...@@ -68,7 +68,7 @@ void AppendHeader(std::string* output, ...@@ -68,7 +68,7 @@ void AppendHeader(std::string* output,
output->append("<meta charset='utf-8'>\n"); output->append("<meta charset='utf-8'>\n");
if (refresh > 0) { if (refresh > 0) {
output->append("<meta http-equiv='refresh' content='"); output->append("<meta http-equiv='refresh' content='");
output->append(base::IntToString(refresh)); output->append(base::NumberToString(refresh));
output->append("'/>\n"); output->append("'/>\n");
} }
} }
......
...@@ -55,7 +55,7 @@ web::WebUIIOSDataSource* CreateVersionUIDataSource() { ...@@ -55,7 +55,7 @@ web::WebUIIOSDataSource* CreateVersionUIDataSource() {
html_source->AddString( html_source->AddString(
version_ui::kCopyright, version_ui::kCopyright,
l10n_util::GetStringFUTF16(IDS_IOS_ABOUT_VERSION_COPYRIGHT, l10n_util::GetStringFUTF16(IDS_IOS_ABOUT_VERSION_COPYRIGHT,
base::IntToString16(exploded_time.year))); base::NumberToString16(exploded_time.year)));
html_source->AddLocalizedString(version_ui::kRevision, html_source->AddLocalizedString(version_ui::kRevision,
IDS_VERSION_UI_REVISION); IDS_VERSION_UI_REVISION);
std::string last_change = version_info::GetLastChange(); std::string last_change = version_info::GetLastChange();
......
...@@ -219,7 +219,7 @@ TEST_P(HistoryStateOperationsTest, NoOpPushDifferentOrigin) { ...@@ -219,7 +219,7 @@ TEST_P(HistoryStateOperationsTest, NoOpPushDifferentOrigin) {
// occurred as the result of the pushState() call. // occurred as the result of the pushState() call.
std::string empty_state; std::string empty_state;
std::string empty_title; std::string empty_title;
std::string new_port_string = base::IntToString( std::string new_port_string = base::NumberToString(
web::test::HttpServer::GetSharedInstance().GetPort() + 1); web::test::HttpServer::GetSharedInstance().GetPort() + 1);
url::Replacements<char> port_replacement; url::Replacements<char> port_replacement;
port_replacement.SetPort(new_port_string.c_str(), port_replacement.SetPort(new_port_string.c_str(),
...@@ -241,7 +241,7 @@ TEST_P(HistoryStateOperationsTest, NoOpReplaceDifferentOrigin) { ...@@ -241,7 +241,7 @@ TEST_P(HistoryStateOperationsTest, NoOpReplaceDifferentOrigin) {
// occurred as the result of the pushState() call. // occurred as the result of the pushState() call.
std::string empty_state; std::string empty_state;
std::string empty_title; std::string empty_title;
std::string new_port_string = base::IntToString( std::string new_port_string = base::NumberToString(
web::test::HttpServer::GetSharedInstance().GetPort() + 1); web::test::HttpServer::GetSharedInstance().GetPort() + 1);
url::Replacements<char> port_replacement; url::Replacements<char> port_replacement;
port_replacement.SetPort(new_port_string.c_str(), port_replacement.SetPort(new_port_string.c_str(),
......
...@@ -122,7 +122,7 @@ using web::test::HttpServer; ...@@ -122,7 +122,7 @@ using web::test::HttpServer;
performAction:grey_scrollInDirection(kGREYDirectionDown, offset)]; performAction:grey_scrollInDirection(kGREYDirectionDown, offset)];
// Add a query parameter so the next load creates another NavigationItem. // Add a query parameter so the next load creates another NavigationItem.
GURL::Replacements replacements; GURL::Replacements replacements;
replacements.SetQueryStr(base::IntToString(i)); replacements.SetQueryStr(base::NumberToString(i));
[ShellEarlGrey loadURL:baseURL.ReplaceComponents(replacements)]; [ShellEarlGrey loadURL:baseURL.ReplaceComponents(replacements)];
// Wait for the content offset to be set to {0, 0}. // Wait for the content offset to be set to {0, 0}.
WaitForOffset(0.0); WaitForOffset(0.0);
......
...@@ -173,7 +173,7 @@ std::unique_ptr<base::Value> MojoFacade::HandleMojoHandleWriteMessage( ...@@ -173,7 +173,7 @@ std::unique_ptr<base::Value> MojoFacade::HandleMojoHandleWriteMessage(
std::vector<uint8_t> bytes(buffer->size()); std::vector<uint8_t> bytes(buffer->size());
for (size_t i = 0; i < buffer->size(); i++) { for (size_t i = 0; i < buffer->size(); i++) {
int one_byte = 0; int one_byte = 0;
buffer->GetInteger(base::IntToString(i), &one_byte); buffer->GetInteger(base::NumberToString(i), &one_byte);
bytes[i] = one_byte; bytes[i] = one_byte;
} }
......
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