//chrome: Convert base::(U)Int(64)ToString(16) to NumberToString(16)
Removed casts where they are now unnecessary.
This is a mechanical change; there is no intended behavior change.
Change-Id: Icde55319b8c0722071d149dff5ca5cf8f1cc7876
Reviewed-on: https://chromium-review.googlesource.com/c/1451356
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Maksim Ivanov <[email protected]>
Commit-Queue: Maksim Ivanov <[email protected]>
Auto-Submit: Raul Tambre <[email protected]>
Cr-Commit-Position: refs/heads/master@{#628724}diff --git a/chrome/browser/accessibility/interstitial_accessibility_browsertest.cc b/chrome/browser/accessibility/interstitial_accessibility_browsertest.cc
index c8ef662..d51d8eb 100644
--- a/chrome/browser/accessibility/interstitial_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/interstitial_accessibility_browsertest.cc
@@ -72,7 +72,7 @@
SSLBlockingPage* ssl_interstitial = static_cast<SSLBlockingPage*>(
interstitial_page->GetDelegateForTesting());
ssl_interstitial->CommandReceived(
- base::IntToString(security_interstitials::CMD_PROCEED));
+ base::NumberToString(security_interstitials::CMD_PROCEED));
}
};
diff --git a/chrome/browser/android/devtools_manager_delegate_android.cc b/chrome/browser/android/devtools_manager_delegate_android.cc
index 6fe04d8..f805a467 100644
--- a/chrome/browser/android/devtools_manager_delegate_android.cc
+++ b/chrome/browser/android/devtools_manager_delegate_android.cc
@@ -181,7 +181,7 @@
if (result)
return result;
- result = DevToolsAgentHost::Forward(base::IntToString(tab->GetAndroidId()),
+ result = DevToolsAgentHost::Forward(base::NumberToString(tab->GetAndroidId()),
std::make_unique<TabProxyDelegate>(tab));
tab->SetDevToolsAgentHost(result);
return result;
diff --git a/chrome/browser/android/history_report/delta_file_backend_leveldb.cc b/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
index 0c5337b5..98dfa0e 100644
--- a/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
+++ b/chrome/browser/android/history_report/delta_file_backend_leveldb.cc
@@ -248,7 +248,7 @@
std::unique_ptr<leveldb::Iterator> db_it(db_->NewIterator(options));
int num_entries = 0;
for (db_it->SeekToFirst(); db_it->Valid(); db_it->Next()) num_entries++;
- dump.append(base::IntToString(num_entries));
+ dump.append(base::NumberToString(num_entries));
dump.append("]");
return dump;
}
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
index a101f56..5965cbd 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
@@ -143,7 +143,8 @@
return dump;
}
dump.append("num pending entries=");
- dump.append(base::IntToString(usage_report_util::DatabaseEntries(db_.get())));
+ dump.append(
+ base::NumberToString(usage_report_util::DatabaseEntries(db_.get())));
dump.append("]");
return dump;
}
diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browser/android/metrics/uma_session_stats.cc
index f8bec8e3..93fd733 100644
--- a/chrome/browser/android/metrics/uma_session_stats.cc
+++ b/chrome/browser/android/metrics/uma_session_stats.cc
@@ -215,7 +215,8 @@
variations::ActiveGroupId active_group;
active_group.name = variations::HashName(trial_name_utf8);
for (int experiment_id : experiment_ids) {
- active_group.group = variations::HashName(base::IntToString(experiment_id));
+ active_group.group =
+ variations::HashName(base::NumberToString(experiment_id));
// Since external experiments are not based on Chrome's low entropy source,
// they are only sent to Google web properties for signed in users to make
// sure that this couldn't be used to identify a user that's not signed in.
diff --git a/chrome/browser/android/ntp/content_suggestions_notifier_service.cc b/chrome/browser/android/ntp/content_suggestions_notifier_service.cc
index fd2437f..d21e6a6 100644
--- a/chrome/browser/android/ntp/content_suggestions_notifier_service.cc
+++ b/chrome/browser/android/ntp/content_suggestions_notifier_service.cc
@@ -153,7 +153,7 @@
service_->GetSuggestionsForCategory(category).size() - 1;
text = l10n_util::GetStringFUTF16(
IDS_NTP_NOTIFICATIONS_READ_THIS_STORY_AND_MORE,
- suggestion->publisher_name(), base::IntToString16(extra_count));
+ suggestion->publisher_name(), base::NumberToString16(extra_count));
} else {
text = suggestion->publisher_name();
}
diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.cc b/chrome/browser/android/thumbnail/thumbnail_cache.cc
index 205563c4..8fc2816a 100644
--- a/chrome/browser/android/thumbnail/thumbnail_cache.cc
+++ b/chrome/browser/android/thumbnail/thumbnail_cache.cc
@@ -261,7 +261,7 @@
base::FilePath ThumbnailCache::GetFilePath(TabId tab_id) {
base::FilePath path = GetCacheDirectory();
- return path.Append(base::IntToString(tab_id));
+ return path.Append(base::NumberToString(tab_id));
}
bool ThumbnailCache::CheckAndUpdateThumbnailMetaData(TabId tab_id,
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 316215d..6275a81e 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -3075,7 +3075,7 @@
// number.
for (auto* download : saved_downloads) {
const std::string port_string =
- base::UintToString(embedded_test_server()->port());
+ base::NumberToString(embedded_test_server()->port());
url::Replacements<char> replacements;
replacements.SetPort(port_string.c_str(),
url::Component(0, port_string.size()));
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 72ae575f..b85825d 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -2150,14 +2150,14 @@
std::vector<AutofillProfile> profiles;
for (int i = 0; i < kNumProfiles; i++) {
AutofillProfile profile;
- base::string16 name(base::IntToString16(i));
+ base::string16 name(base::NumberToString16(i));
base::string16 email(name + ASCIIToUTF16("@example.com"));
- base::string16 street = ASCIIToUTF16(
- base::IntToString(base::RandInt(0, 10000)) + " " +
- streets[base::RandInt(0, streets.size() - 1)]);
+ base::string16 street =
+ ASCIIToUTF16(base::NumberToString(base::RandInt(0, 10000)) + " " +
+ streets[base::RandInt(0, streets.size() - 1)]);
base::string16 city =
ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]);
- base::string16 zip(base::IntToString16(base::RandInt(0, 10000)));
+ base::string16 zip(base::NumberToString16(base::RandInt(0, 10000)));
profile.SetRawInfo(NAME_FIRST, name);
profile.SetRawInfo(EMAIL_ADDRESS, email);
profile.SetRawInfo(ADDRESS_HOME_LINE1, street);
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 01455bd..910d451 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -245,7 +245,7 @@
bool WriteTime(const std::string& time_string) {
int64_t internal_value;
base::StringToInt64(time_string, &internal_value);
- return Write(base::Int64ToString(
+ return Write(base::NumberToString(
base::Time::FromInternalValue(internal_value).ToTimeT()));
}
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index be047438..0c40ff35 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -2633,8 +2633,8 @@
// Add a bookmark with a visited timestamp before the deletion interval.
bookmarks::BookmarkNode::MetaInfoMap meta_info = {
{"last_visited",
- base::Int64ToString((delete_begin - base::TimeDelta::FromSeconds(1))
- .ToInternalValue())}};
+ base::NumberToString((delete_begin - base::TimeDelta::FromSeconds(1))
+ .ToInternalValue())}};
bookmark_model->AddURLWithCreationTimeAndMetaInfo(
bookmark_model->mobile_node(), 0, base::ASCIIToUTF16("my title"),
GURL("http://foo-2.org/"), delete_begin - base::TimeDelta::FromDays(1),
diff --git a/chrome/browser/chrome_content_browser_client_browsertest_chromeos.cc b/chrome/browser/chrome_content_browser_client_browsertest_chromeos.cc
index aea2590..80aa8eb 100644
--- a/chrome/browser/chrome_content_browser_client_browsertest_chromeos.cc
+++ b/chrome/browser/chrome_content_browser_client_browsertest_chromeos.cc
@@ -37,8 +37,9 @@
std::string ReadCmdLine(pid_t pid) {
// Files in "/proc" are in-memory, so it's safe to do IO.
base::ScopedAllowBlockingForTesting allow_io;
- base::FilePath cmdline_file =
- base::FilePath("/proc").Append(base::IntToString(pid)).Append("cmdline");
+ base::FilePath cmdline_file = base::FilePath("/proc")
+ .Append(base::NumberToString(pid))
+ .Append("cmdline");
std::string cmdline;
base::ReadFileToString(cmdline_file, &cmdline);
return cmdline;
diff --git a/chrome/browser/chrome_navigation_browsertest.cc b/chrome/browser/chrome_navigation_browsertest.cc
index 44c8213..b2a651a 100644
--- a/chrome/browser/chrome_navigation_browsertest.cc
+++ b/chrome/browser/chrome_navigation_browsertest.cc
@@ -435,7 +435,7 @@
// the |embedded_test_server| uses. It is required to test with potentially
// malformed URLs.
std::string port =
- base::IntToString(embedded_test_server()->host_port_pair().port());
+ base::NumberToString(embedded_test_server()->host_port_pair().port());
command_line->AppendSwitchASCII(
"host-resolver-rules",
"MAP * 127.0.0.1:" + port + ", EXCLUDE 127.0.0.1*");
diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc
index 6b20913..3fd5d017 100644
--- a/chrome/browser/chromeos/app_mode/fake_cws.cc
+++ b/chrome/browser/chromeos/app_mode/fake_cws.cc
@@ -131,7 +131,7 @@
base::ReplaceSubstringsAfterOffset(&update_check_content, 0, "$FP",
sha256_hex);
base::ReplaceSubstringsAfterOffset(&update_check_content, 0, "$Size",
- base::UintToString(crx_content.size()));
+ base::NumberToString(crx_content.size()));
base::ReplaceSubstringsAfterOffset(&update_check_content, 0, "$Version",
version);
id_to_update_check_content_map_[app_id] = update_check_content;
diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc
index 829bb2f1..2afee80 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc
@@ -85,7 +85,7 @@
void KioskDiagnosisRunner::StartSystemLogCollection() {
const std::string description = base::StringPrintf(
"Autogenerated feedback:\nAppId: %s\n(uniquifier:%s)", app_id_.c_str(),
- base::Int64ToString(base::Time::Now().ToInternalValue()).c_str());
+ base::NumberToString(base::Time::Now().ToInternalValue()).c_str());
feedback_util::SendSysLogFeedback(
profile_, description, base::Bind(&KioskDiagnosisRunner::OnFeedbackSent,
weak_factory_.GetWeakPtr()));
diff --git a/chrome/browser/chromeos/crostini/crostini_registry_service.cc b/chrome/browser/chromeos/crostini/crostini_registry_service.cc
index 32e1b75..0bd0736 100644
--- a/chrome/browser/chromeos/crostini/crostini_registry_service.cc
+++ b/chrome/browser/chromeos/crostini/crostini_registry_service.cc
@@ -851,7 +851,7 @@
const char* key) const {
DCHECK(dictionary);
int64_t time = clock_->Now().ToDeltaSinceWindowsEpoch().InMicroseconds();
- dictionary->SetKey(key, base::Value(base::Int64ToString(time)));
+ dictionary->SetKey(key, base::Value(base::NumberToString(time)));
}
void CrostiniRegistryService::SetAppScaled(const std::string& app_id,
diff --git a/chrome/browser/chromeos/crostini/crosvm_process_list.cc b/chrome/browser/chromeos/crostini/crosvm_process_list.cc
index ad0a19b..9e7f69b 100644
--- a/chrome/browser/chromeos/crostini/crosvm_process_list.cc
+++ b/chrome/browser/chromeos/crostini/crosvm_process_list.cc
@@ -31,7 +31,7 @@
pid_t* vm_concierge_pid_out,
const base::FilePath& slash_proc) {
base::FilePath file_path =
- slash_proc.Append(base::IntToString(pid)).Append("stat");
+ slash_proc.Append(base::NumberToString(pid)).Append("stat");
base::Optional<chromeos::system::SingleProcStat> stat =
chromeos::system::GetSingleProcStat(file_path);
if (!stat.has_value())
diff --git a/chrome/browser/chromeos/crostini/crosvm_process_list_unittest.cc b/chrome/browser/chromeos/crostini/crosvm_process_list_unittest.cc
index 433c25e..1499e814 100644
--- a/chrome/browser/chromeos/crostini/crosvm_process_list_unittest.cc
+++ b/chrome/browser/chromeos/crostini/crosvm_process_list_unittest.cc
@@ -60,7 +60,7 @@
.stime = 1333,
.rss = 3149}}};
WriteContentsToFileUnderSubdir(stat_contents,
- base::IntToString(concierge_pid), "stat");
+ base::NumberToString(concierge_pid), "stat");
EXPECT_EQ(expected, GetCrosvmPidStatMap(slash_proc_));
}
@@ -85,7 +85,7 @@
"0 0 0 0 0 17 2 0 0 0 0 0 96193203229904 96193203257392 96193216815104 "
"140726650461974 140726650461996 140726650461996 140726650462178 0";
WriteContentsToFileUnderSubdir(stat_contents,
- base::IntToString(concierge_pid), "stat");
+ base::NumberToString(concierge_pid), "stat");
pid_t other_pid = 1111;
std::string other_stat_contents =
@@ -95,7 +95,7 @@
"0 0 0 0 0 17 2 0 0 0 0 0 96193203229904 96193203257392 96193216815104 "
"140726650461974 140726650461996 140726650461996 140726650462178 0";
WriteContentsToFileUnderSubdir(other_stat_contents,
- base::IntToString(other_pid), "stat");
+ base::NumberToString(other_pid), "stat");
PidStatMap expected = {{concierge_pid,
{.pid = concierge_pid,
@@ -116,7 +116,7 @@
"0 0 0 0 0 17 2 0 0 0 0 0 96193203229904 96193203257392 96193216815104 "
"140726650461974 140726650461996 140726650461996 140726650462178 0";
WriteContentsToFileUnderSubdir(stat_contents,
- base::IntToString(concierge_pid), "stat");
+ base::NumberToString(concierge_pid), "stat");
pid_t child_pid = 3333;
std::string child_stat_contents =
@@ -126,7 +126,7 @@
"0 0 0 0 0 17 2 0 0 0 0 0 96193203229904 96193203257392 96193216815104 "
"140726650461974 140726650461996 140726650461996 140726650462178 0";
WriteContentsToFileUnderSubdir(child_stat_contents,
- base::IntToString(child_pid), "stat");
+ base::NumberToString(child_pid), "stat");
pid_t grand_child_pid = 4444;
std::string grand_child_stat_contents =
@@ -137,7 +137,7 @@
"0 0 0 0 0 17 2 0 0 0 0 0 96193203229904 96193203257392 96193216815104 "
"140726650461974 140726650461996 140726650461996 140726650462178 0";
WriteContentsToFileUnderSubdir(grand_child_stat_contents,
- base::IntToString(grand_child_pid), "stat");
+ base::NumberToString(grand_child_pid), "stat");
PidStatMap expected = {{concierge_pid,
{.pid = concierge_pid,
diff --git a/chrome/browser/chromeos/display/display_prefs_browsertest.cc b/chrome/browser/chromeos/display/display_prefs_browsertest.cc
index 50dea52b..704698cc 100644
--- a/chrome/browser/chromeos/display/display_prefs_browsertest.cc
+++ b/chrome/browser/chromeos/display/display_prefs_browsertest.cc
@@ -28,7 +28,7 @@
const base::DictionaryValue* display_properties =
local_state_->GetDictionary(ash::prefs::kDisplayProperties);
return display_properties ? display_properties->FindKeyOfType(
- base::Int64ToString(display_id),
+ base::NumberToString(display_id),
base::Value::Type::DICTIONARY)
: nullptr;
}
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index c876501..698f488 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -264,7 +264,7 @@
break;
default:
- user_image = base::IntToString(user->image_index());
+ user_image = base::NumberToString(user->image_index());
break;
}
result->SetString("userImage", user_image);
@@ -784,7 +784,7 @@
base::Value(package_info->package_version));
package_value->SetKey(
"lastBackupAndroidId",
- base::Value(base::Int64ToString(package_info->last_backup_android_id)));
+ base::Value(base::NumberToString(package_info->last_backup_android_id)));
package_value->SetKey("lastBackupTime",
base::Value(base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc
index c356da5..528a2de2 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc
@@ -33,11 +33,11 @@
if (log_on_completion_) {
logger->Log(logging::LOG_INFO, "%s[%d] %s. (elapsed time: %sms)", name(),
request_id(), success ? "succeeded" : "failed",
- base::Int64ToString(elapsed).c_str());
+ base::NumberToString(elapsed).c_str());
} else if (elapsed >= kSlowOperationThresholdMs) {
logger->Log(logging::LOG_WARNING,
"PEFORMANCE WARNING: %s[%d] was slow. (elapsed time: %sms)",
- name(), request_id(), base::Int64ToString(elapsed).c_str());
+ name(), request_id(), base::NumberToString(elapsed).c_str());
}
}
ChromeAsyncExtensionFunction::OnResponded();
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index 5cf1eef3..cdf842e 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -215,7 +215,7 @@
const size_t kMaxFileSystems = 16;
for (size_t i = 0; i < kMaxFileSystems; ++i) {
const std::string file_system_id =
- std::string("test-") + base::IntToString(i);
+ std::string("test-") + base::NumberToString(i);
EXPECT_EQ(base::File::FILE_OK,
service_->MountFileSystem(
kProviderId, MountOptions(file_system_id, kDisplayName)));
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
index efe4580..d7e7ff02 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc
@@ -111,7 +111,7 @@
// Configure the endpoint to use the test server's port.
const GURL url(kTestEndpointUrl);
GURL::Replacements replacements;
- std::string port(base::IntToString(embedded_test_server()->port()));
+ std::string port(base::NumberToString(embedded_test_server()->port()));
replacements.SetPortStr(port);
endpoint_url_ = url.ReplaceComponents(replacements).spec();
controller_->SetAppInfoForTest(kTestAppId, endpoint_url_);
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
index 394de345..73a5aff 100644
--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -176,7 +176,7 @@
auto user_dict = std::make_unique<base::DictionaryValue>();
user_dict->SetString("account_type", "google");
user_dict->SetString("email", user_id);
- user_dict->SetString("gaia_id", base::IntToString(gaia_id++));
+ user_dict->SetString("gaia_id", base::NumberToString(gaia_id++));
known_users_list->Append(std::move(user_dict));
}
local_state.SetList("KnownUsers", std::move(known_users_list));
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc b/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc
index 203f1906..a61578a0 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc
+++ b/chrome/browser/chromeos/login/demo_mode/demo_mode_detector_unittest.cc
@@ -80,7 +80,7 @@
void DemoModeDetectorTest::SetTimeOnOobePref(base::TimeDelta time_on_oobe) {
local_state_.SetUserPref(prefs::kTimeOnOobe,
std::make_unique<base::Value>(
- base::Int64ToString(time_on_oobe.InSeconds())));
+ base::NumberToString(time_on_oobe.InSeconds())));
}
base::TimeDelta DemoModeDetectorTest::GetTimeOnOobePref() {
diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
index 124be540..8d02b4c 100644
--- a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
@@ -187,7 +187,7 @@
uint32_t passkey) {
VLOG(1) << "DisplayPassKey id = " << device->GetDeviceID()
<< " name = " << device->GetNameForDisplay();
- std::string pincode = base::UintToString(passkey);
+ std::string pincode = base::NumberToString(passkey);
pincode = std::string(kPincodeLength - pincode.length(), '0').append(pincode);
// No differences in UI for passkey and pincode authentication calls.
DisplayPinCode(device, pincode);
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_store.cc b/chrome/browser/chromeos/policy/cloud_external_data_store.cc
index 519a1f7..0fee627 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_store.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_store.cc
@@ -20,9 +20,8 @@
std::string GetSubkey(const std::string& policy, const std::string& hash) {
DCHECK(!policy.empty());
DCHECK(!hash.empty());
- return base::IntToString(policy.size()) + ":" +
- base::IntToString(hash.size()) + ":" +
- policy + hash;
+ return base::NumberToString(policy.size()) + ":" +
+ base::NumberToString(hash.size()) + ":" + policy + hash;
}
} // namespace
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
index 319851f..e756938 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -852,7 +852,7 @@
std::string DeviceStatusCollector::ActivityStorage::MakeActivityPeriodPrefKey(
int64_t start,
const std::string& user_email) {
- const std::string day_key = base::Int64ToString(start);
+ const std::string day_key = base::NumberToString(start);
if (user_email.empty())
return day_key;
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
index e20dfa01..3112cd4 100644
--- a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
@@ -351,11 +351,11 @@
// big deal (the new message will replace the old, which is the behavior we
// want anyway, per:
// https://developer.chrome.com/apps/cloudMessaging#send_messages
- message.id = base::Int64ToString(
- base::Time::NowFromSystemTime().ToInternalValue());
+ message.id =
+ base::NumberToString(base::Time::NowFromSystemTime().ToInternalValue());
message.data[kGcmMessageTypeKey] = kHeartbeatTypeValue;
- message.data[kHeartbeatTimestampKey] = base::Int64ToString(
- base::Time::NowFromSystemTime().ToJavaTime());
+ message.data[kHeartbeatTimestampKey] =
+ base::NumberToString(base::Time::NowFromSystemTime().ToJavaTime());
message.data[kHeartbeatDomainNameKey] = enrollment_domain_;
message.data[kHeartbeatDeviceIDKey] = device_id_;
gcm_driver_->Send(kHeartbeatGCMAppID,
@@ -380,7 +380,7 @@
gcm::OutgoingMessage message;
message.id =
- base::Int64ToString(base::Time::NowFromSystemTime().ToInternalValue());
+ base::NumberToString(base::Time::NowFromSystemTime().ToInternalValue());
message.data[kGcmMessageTypeKey] = kUpstreamNotificationSignUpListeningEvents;
message.data[kUpstreamNotificationNotifyKey] =
GetDestinationID() + kHeartbeatGCMSenderSuffix;
diff --git a/chrome/browser/chromeos/power/auto_screen_brightness/als_reader_impl_unittest.cc b/chrome/browser/chromeos/power/auto_screen_brightness/als_reader_impl_unittest.cc
index af294652..8c96de07 100644
--- a/chrome/browser/chromeos/power/auto_screen_brightness/als_reader_impl_unittest.cc
+++ b/chrome/browser/chromeos/power/auto_screen_brightness/als_reader_impl_unittest.cc
@@ -68,7 +68,7 @@
protected:
void WriteLux(int lux) {
- const std::string lux_string = base::IntToString(lux);
+ const std::string lux_string = base::NumberToString(lux);
const int bytes_written = base::WriteFile(
ambient_light_path_, lux_string.data(), lux_string.size());
ASSERT_EQ(bytes_written, static_cast<int>(lux_string.size()))
diff --git a/chrome/browser/chromeos/power/cpu_data_collector.cc b/chrome/browser/chromeos/power/cpu_data_collector.cc
index c104501d..558eaa9 100644
--- a/chrome/browser/chromeos/power/cpu_data_collector.cc
+++ b/chrome/browser/chromeos/power/cpu_data_collector.cc
@@ -360,7 +360,7 @@
return false;
}
- const std::string state_name = base::IntToString(freq_in_khz / 1000);
+ const std::string state_name = base::NumberToString(freq_in_khz / 1000);
size_t index = EnsureInVector(state_name, cpu_freq_state_names);
if (index >= freq_sample->time_in_state.size())
freq_sample->time_in_state.resize(index + 1);
@@ -407,7 +407,7 @@
return false;
}
- const std::string state_name = base::IntToString(freq_in_khz / 1000);
+ const std::string state_name = base::NumberToString(freq_in_khz / 1000);
size_t index = EnsureInVector(state_name, cpu_freq_state_names);
for (int cpu = 0; cpu < online_cpu_count; ++cpu) {
// array.size() is previously checked to be equal to online_cpu_count+1.
diff --git a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc
index 4948294e..69cf8a6 100644
--- a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc
+++ b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc
@@ -77,9 +77,9 @@
void SetShouldFreezeRenderer(base::ProcessHandle handle, bool frozen) {
DCHECK(file_thread_->RunsTasksInCurrentSequence());
- WriteCommandToFile(base::IntToString(handle),
- frozen ? to_be_frozen_control_path_
- : default_control_path_);
+ WriteCommandToFile(
+ base::NumberToString(handle),
+ frozen ? to_be_frozen_control_path_ : default_control_path_);
}
void FreezeRenderers() {
diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification.cc b/chrome/browser/chromeos/printing/cups_print_job_notification.cc
index ea66997b..da3bffd 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification.cc
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification.cc
@@ -223,7 +223,7 @@
if (print_job_->total_page_number() > 1) {
message = l10n_util::GetStringFUTF16(
IDS_PRINT_JOB_NOTIFICATION_MESSAGE,
- base::IntToString16(print_job_->total_page_number()),
+ base::NumberToString16(print_job_->total_page_number()),
base::UTF8ToUTF16(print_job_->printer().display_name()));
} else {
message = l10n_util::GetStringFUTF16(
diff --git a/chrome/browser/chromeos/session_length_limiter_unittest.cc b/chrome/browser/chromeos/session_length_limiter_unittest.cc
index 6d4fc32..b24dc155 100644
--- a/chrome/browser/chromeos/session_length_limiter_unittest.cc
+++ b/chrome/browser/chromeos/session_length_limiter_unittest.cc
@@ -122,7 +122,7 @@
void SessionLengthLimiterTest::SetSessionStartTimePref(
const base::TimeTicks& session_start_time) {
local_state_.SetUserPref(prefs::kSessionStartTime,
- std::make_unique<base::Value>(base::Int64ToString(
+ std::make_unique<base::Value>(base::NumberToString(
session_start_time.ToInternalValue())));
}
diff --git a/chrome/browser/chromeos/system/procfs_util_unittest.cc b/chrome/browser/chromeos/system/procfs_util_unittest.cc
index fe8dc5aa..30d5c1b 100644
--- a/chrome/browser/chromeos/system/procfs_util_unittest.cc
+++ b/chrome/browser/chromeos/system/procfs_util_unittest.cc
@@ -64,10 +64,11 @@
.utime = 466410,
.stime = 80831,
.rss = 130441};
- WriteContentsToFileUnderSubdir(stat_contents, base::IntToString(pid), "stat");
+ WriteContentsToFileUnderSubdir(stat_contents, base::NumberToString(pid),
+ "stat");
EXPECT_EQ(expected,
GetSingleProcStat(
- slash_proc_.Append(base::IntToString(pid)).Append("stat"))
+ slash_proc_.Append(base::NumberToString(pid)).Append("stat"))
.value());
}
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
index 997b871..2dff3f2 100644
--- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
@@ -54,7 +54,7 @@
void ReadUserLogFiles(const std::vector<base::FilePath>& profile_dirs,
SystemLogsResponse* response) {
for (size_t i = 0; i < profile_dirs.size(); ++i) {
- std::string profile_prefix = "Profile[" + base::UintToString(i) + "] ";
+ std::string profile_prefix = "Profile[" + base::NumberToString(i) + "] ";
for (const auto& log : kUserLogs) {
std::string value;
const bool read_success = base::ReadFileToString(
diff --git a/chrome/browser/client_hints/client_hints_unittest.cc b/chrome/browser/client_hints/client_hints_unittest.cc
index 3b8412e..4012f8d3 100644
--- a/chrome/browser/client_hints/client_hints_unittest.cc
+++ b/chrome/browser/client_hints/client_hints_unittest.cc
@@ -147,7 +147,7 @@
// test failing to (1/20)^20.
for (size_t i = 0; i < 20; ++i) {
int value = client_hints::internal::RoundRtt(
- base::IntToString(i), base::TimeDelta::FromMilliseconds(1023));
+ base::NumberToString(i), base::TimeDelta::FromMilliseconds(1023));
// If |value| is different than |initial_value|, it implies that RTT is
// randomized by host. This verifies the behavior, and test can be ended.
if (value != initial_value)
@@ -172,7 +172,7 @@
// test failing to (1/20)^20.
for (size_t i = 0; i < 20; ++i) {
int value =
- client_hints::internal::RoundKbpsToMbps(base::IntToString(i), 1023);
+ client_hints::internal::RoundKbpsToMbps(base::NumberToString(i), 1023);
// If |value| is different than |initial_value|, it implies that downlink is
// randomized by host. This verifies the behavior, and test can be ended.
if (value != initial_value)
diff --git a/chrome/browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc b/chrome/browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc
index f4c46fc..3f561b7 100644
--- a/chrome/browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc
+++ b/chrome/browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc
@@ -222,7 +222,7 @@
"var image = document.createElement('img'); "
"document.body.appendChild(image); image.src = '")
.append(kImagePrefix)
- .append(base::IntToString(i))
+ .append(base::NumberToString(i))
.append(".png';");
EXPECT_TRUE(content::ExecuteScript(contents(), create_image_script));
}
@@ -317,7 +317,7 @@
"var image = document.createElement('img'); "
"document.body.appendChild(image); image.src = '")
.append(GetURL(std::string(kImagePrefix)
- .append(base::IntToString(++j))
+ .append(base::NumberToString(++j))
.append(".png';"))
.spec());
diff --git a/chrome/browser/devtools/device/cast_device_provider.cc b/chrome/browser/devtools/device/cast_device_provider.cc
index e40d8bd..7544bbd 100644
--- a/chrome/browser/devtools/device/cast_device_provider.cc
+++ b/chrome/browser/devtools/device/cast_device_provider.cc
@@ -71,7 +71,7 @@
device_info.model = kUnknownCastDevice;
AndroidDeviceManager::BrowserInfo browser_info;
- browser_info.socket_name = base::IntToString(kCastInspectPort);
+ browser_info.socket_name = base::NumberToString(kCastInspectPort);
browser_info.display_name =
base::SplitString(service_description.service_name, ".",
base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)[0];
diff --git a/chrome/browser/devtools/device/port_forwarding_browsertest.cc b/chrome/browser/devtools/device/port_forwarding_browsertest.cc
index c62ddf1..3c48120 100644
--- a/chrome/browser/devtools/device/port_forwarding_browsertest.cc
+++ b/chrome/browser/devtools/device/port_forwarding_browsertest.cc
@@ -41,8 +41,9 @@
}
void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort,
- base::IntToString(GetRemoteDebuggingPort()));
+ command_line->AppendSwitchASCII(
+ switches::kRemoteDebuggingPort,
+ base::NumberToString(GetRemoteDebuggingPort()));
}
protected:
diff --git a/chrome/browser/devtools/device/tcp_device_provider.cc b/chrome/browser/devtools/device/tcp_device_provider.cc
index 84a7942..c761a0bb 100644
--- a/chrome/browser/devtools/device/tcp_device_provider.cc
+++ b/chrome/browser/devtools/device/tcp_device_provider.cc
@@ -111,7 +111,7 @@
if (serial != target.host())
continue;
AndroidDeviceManager::BrowserInfo browser_info;
- browser_info.socket_name = base::UintToString(target.port());
+ browser_info.socket_name = base::NumberToString(target.port());
browser_info.display_name = kBrowserName;
browser_info.type = AndroidDeviceManager::BrowserInfo::kTypeChrome;
diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc
index f2871e4..2ad2200 100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -386,7 +386,7 @@
auto port_status_dict = std::make_unique<base::DictionaryValue>();
const PortStatusMap& port_status_map = sit->second;
for (auto it = port_status_map.begin(); it != port_status_map.end(); ++it) {
- port_status_dict->SetInteger(base::IntToString(it->first), it->second);
+ port_status_dict->SetInteger(base::NumberToString(it->first), it->second);
}
auto device_status_dict = std::make_unique<base::DictionaryValue>();
diff --git a/chrome/browser/devtools/protocol_string.h b/chrome/browser/devtools/protocol_string.h
index 0e68d7f..b7eea7c 100644
--- a/chrome/browser/devtools/protocol_string.h
+++ b/chrome/browser/devtools/protocol_string.h
@@ -43,7 +43,7 @@
static String substring(const String& s, unsigned pos, unsigned len) {
return s.substr(pos, len);
}
- static String fromInteger(int number) { return base::IntToString(number); }
+ static String fromInteger(int number) { return base::NumberToString(number); }
static String fromDouble(double number) {
String s = base::NumberToString(number);
if (!s.empty() && s[0] == '.')
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 0f48441..e57ed9c 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -66,7 +66,7 @@
if (last_tethering_port_ == kMaxTetheringPort)
last_tethering_port_ = kMinTetheringPort;
uint16_t port = ++last_tethering_port_;
- *name = base::UintToString(port);
+ *name = base::NumberToString(port);
return CreateLocalHostServerSocket(port);
}
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index af2209d..ba4636b 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -65,7 +65,7 @@
RecordFailure(DIAG_RECON_UNABLE_TO_QUERY, "Unable to query free space");
return true;
}
- std::string printable_size = base::Int64ToString(disk_space);
+ std::string printable_size = base::NumberToString(disk_space);
if (disk_space < 80 * kOneMegabyte) {
RecordFailure(DIAG_RECON_LOW_DISK_SPACE,
"Low disk space: " + printable_size);
@@ -161,7 +161,7 @@
json.Deserialize(&error_code, &error_message));
if (base::JSONReader::JSON_NO_ERROR != error_code) {
if (error_message.empty()) {
- error_message = "Parse error " + base::IntToString(error_code);
+ error_message = "Parse error " + base::NumberToString(error_code);
}
RecordFailure(DIAG_RECON_PARSE_ERROR, error_message);
return true;
@@ -253,7 +253,7 @@
base::UTF16ToUTF8(dir_or_file.LossyDisplayName()));
return true;
}
- std::string printable_size = base::Int64ToString(dir_or_file_size);
+ std::string printable_size = base::NumberToString(dir_or_file_size);
if (path_info_.max_size > 0) {
if (dir_or_file_size > path_info_.max_size) {
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index deb5737..8925157 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -137,7 +137,7 @@
"Database locked by another process");
} else {
std::string str("Pragma failed. Error: ");
- str += base::IntToString(error);
+ str += base::NumberToString(error);
RecordFailure(DIAG_SQLITE_PRAGMA_FAILED, str);
}
return false;
@@ -158,7 +158,7 @@
// All done. Report to the user.
if (errors != 0) {
std::string str("Database corruption detected: ");
- str += base::IntToString(errors) + " errors";
+ str += base::NumberToString(errors) + " errors";
RecordFailure(DIAG_SQLITE_DB_CORRUPTED, str);
return true;
}
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc
index 2f89253..bdf05087 100644
--- a/chrome/browser/download/download_commands.cc
+++ b/chrome/browser/download/download_commands.cc
@@ -131,7 +131,7 @@
learn_more_url, g_browser_process->GetApplicationLocale());
return net::AppendQueryParameter(
learn_more_url, "ctx",
- base::IntToString(static_cast<int>(model_->download()->GetLastReason())));
+ base::NumberToString(model_->download()->GetLastReason()));
}
bool DownloadCommands::IsCommandEnabled(Command command) const {
diff --git a/chrome/browser/engagement/site_engagement_metrics.cc b/chrome/browser/engagement/site_engagement_metrics.cc
index 9e343a1..0de31bd 100644
--- a/chrome/browser/engagement/site_engagement_metrics.cc
+++ b/chrome/browser/engagement/site_engagement_metrics.cc
@@ -103,7 +103,7 @@
for (const auto& b : score_buckets) {
std::string histogram_name =
- kEngagementBucketHistogramBase + base::IntToString(b.first);
+ kEngagementBucketHistogramBase + base::NumberToString(b.first);
base::LinearHistogram::FactoryGet(
histogram_name, 1, 100, 10,
@@ -153,7 +153,7 @@
for (size_t i = 0; i < base::size(kEngagementBucketHistogramBuckets); ++i) {
histogram_names.push_back(
kEngagementBucketHistogramBase +
- base::IntToString(kEngagementBucketHistogramBuckets[i]));
+ base::NumberToString(kEngagementBucketHistogramBuckets[i]));
}
return histogram_names;
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index eaac524..58e27e6 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -50,7 +50,7 @@
class AutomationApiTest : public ExtensionApiTest {
protected:
GURL GetURLForPath(const std::string& host, const std::string& path) {
- std::string port = base::UintToString(embedded_test_server()->port());
+ std::string port = base::NumberToString(embedded_test_server()->port());
GURL::Replacements replacements;
replacements.SetHostStr(host);
replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
index 125d493..034bd1e 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -266,8 +266,8 @@
NULL, /* browser out param*/
NULL, /* tab_strip out param */
&contents, NULL /* tab_index out param */)) {
- return RespondNow(
- Error(tabs_constants::kTabNotFoundError, base::IntToString(tab_id)));
+ return RespondNow(Error(tabs_constants::kTabNotFoundError,
+ base::NumberToString(tab_id)));
}
} else {
contents = ChromeExtensionFunctionDetails(this)
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index b4e56fd..ff33336 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -112,9 +112,9 @@
bookmark_manager_private::BookmarkNodeDataElement element;
// Add id and parentId so we can associate the data with existing nodes on the
// client side.
- element.id.reset(new std::string(base::Int64ToString(node.id())));
+ element.id.reset(new std::string(base::NumberToString(node.id())));
element.parent_id.reset(
- new std::string(base::Int64ToString(node.parent()->id())));
+ new std::string(base::NumberToString(node.parent()->id())));
if (node.is_url())
element.url.reset(new std::string(node.url().spec()));
@@ -244,7 +244,7 @@
DispatchEvent(events::BOOKMARK_MANAGER_PRIVATE_ON_META_INFO_CHANGED,
bookmark_manager_private::OnMetaInfoChanged::kEventName,
bookmark_manager_private::OnMetaInfoChanged::Create(
- base::Int64ToString(node->id()), changes));
+ base::NumberToString(node->id()), changes));
}
BookmarkManagerPrivateAPI::BookmarkManagerPrivateAPI(
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc
index 9529f7e..b5099b0 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc
@@ -30,7 +30,7 @@
model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("Goog"),
GURL("https://www.google.com"));
// Store node->id() as we will delete |node| in RunOnDeletedNode().
- node_id_ = base::Int64ToString(node->id());
+ node_id_ = base::NumberToString(node->id());
}
std::string node_id() const { return node_id_; }
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
index e9316f3..8b04de24 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
@@ -59,12 +59,12 @@
api::bookmarks::BookmarkTreeNode* out_bookmark_tree_node) {
DCHECK(out_bookmark_tree_node);
- out_bookmark_tree_node->id = base::Int64ToString(node->id());
+ out_bookmark_tree_node->id = base::NumberToString(node->id());
const BookmarkNode* parent = node->parent();
if (parent) {
out_bookmark_tree_node->parent_id.reset(
- new std::string(base::Int64ToString(parent->id())));
+ new std::string(base::NumberToString(parent->id())));
out_bookmark_tree_node->index.reset(new int(parent->GetIndexOf(node)));
}
@@ -159,7 +159,7 @@
value->SetKey(itr->first, base::Value(itr->second));
}
}
- id_to_meta_info_map->Set(base::Int64ToString(node.id()), std::move(value));
+ id_to_meta_info_map->Set(base::NumberToString(node.id()), std::move(value));
if (node.is_folder()) {
for (int i = 0; i < node.child_count(); ++i) {
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
index 82aa4deb..b0e8290 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
@@ -179,7 +179,7 @@
// Verify top level node.
const base::Value* value = NULL;
EXPECT_TRUE(id_to_meta_info_map.Get(
- base::Int64ToString(model_->other_node()->id()), &value));
+ base::NumberToString(model_->other_node()->id()), &value));
ASSERT_TRUE(NULL != value);
const base::DictionaryValue* dictionary_value = NULL;
EXPECT_TRUE(value->GetAsDictionary(&dictionary_value));
@@ -188,8 +188,8 @@
// Verify bookmark with two meta info key/value pairs.
value = NULL;
- EXPECT_TRUE(id_to_meta_info_map.Get(
- base::Int64ToString(node_->id()), &value));
+ EXPECT_TRUE(
+ id_to_meta_info_map.Get(base::NumberToString(node_->id()), &value));
ASSERT_TRUE(NULL != value);
dictionary_value = NULL;
EXPECT_TRUE(value->GetAsDictionary(&dictionary_value));
@@ -203,8 +203,8 @@
// Verify folder with one meta info key/value pair.
value = NULL;
- EXPECT_TRUE(id_to_meta_info_map.Get(
- base::Int64ToString(folder_->id()), &value));
+ EXPECT_TRUE(
+ id_to_meta_info_map.Get(base::NumberToString(folder_->id()), &value));
ASSERT_TRUE(NULL != value);
dictionary_value = NULL;
EXPECT_TRUE(value->GetAsDictionary(&dictionary_value));
@@ -215,8 +215,8 @@
// Verify bookmark in a subfolder with one meta info key/value pairs.
value = NULL;
- EXPECT_TRUE(id_to_meta_info_map.Get(
- base::Int64ToString(node2_->id()), &value));
+ EXPECT_TRUE(
+ id_to_meta_info_map.Get(base::NumberToString(node2_->id()), &value));
ASSERT_TRUE(NULL != value);
dictionary_value = NULL;
EXPECT_TRUE(value->GetAsDictionary(&dictionary_value));
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index b2f8c26..2d8c91c6 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -281,14 +281,14 @@
int new_index) {
const BookmarkNode* node = new_parent->GetChild(new_index);
api::bookmarks::OnMoved::MoveInfo move_info;
- move_info.parent_id = base::Int64ToString(new_parent->id());
+ move_info.parent_id = base::NumberToString(new_parent->id());
move_info.index = new_index;
- move_info.old_parent_id = base::Int64ToString(old_parent->id());
+ move_info.old_parent_id = base::NumberToString(old_parent->id());
move_info.old_index = old_index;
DispatchEvent(events::BOOKMARKS_ON_MOVED, api::bookmarks::OnMoved::kEventName,
- api::bookmarks::OnMoved::Create(base::Int64ToString(node->id()),
- move_info));
+ api::bookmarks::OnMoved::Create(
+ base::NumberToString(node->id()), move_info));
}
void BookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
@@ -300,7 +300,7 @@
DispatchEvent(events::BOOKMARKS_ON_CREATED,
api::bookmarks::OnCreated::kEventName,
api::bookmarks::OnCreated::Create(
- base::Int64ToString(node->id()), tree_node));
+ base::NumberToString(node->id()), tree_node));
}
void BookmarkEventRouter::BookmarkNodeRemoved(
@@ -310,7 +310,7 @@
const BookmarkNode* node,
const std::set<GURL>& removed_urls) {
api::bookmarks::OnRemoved::RemoveInfo remove_info;
- remove_info.parent_id = base::Int64ToString(parent->id());
+ remove_info.parent_id = base::NumberToString(parent->id());
remove_info.index = index;
bookmark_api_helpers::PopulateBookmarkTreeNode(managed_, node, true, false,
&remove_info.node);
@@ -318,7 +318,7 @@
DispatchEvent(events::BOOKMARKS_ON_REMOVED,
api::bookmarks::OnRemoved::kEventName,
api::bookmarks::OnRemoved::Create(
- base::Int64ToString(node->id()), remove_info));
+ base::NumberToString(node->id()), remove_info));
}
void BookmarkEventRouter::BookmarkAllUserNodesRemoved(
@@ -345,7 +345,7 @@
DispatchEvent(events::BOOKMARKS_ON_CHANGED,
api::bookmarks::OnChanged::kEventName,
api::bookmarks::OnChanged::Create(
- base::Int64ToString(node->id()), change_info));
+ base::NumberToString(node->id()), change_info));
}
void BookmarkEventRouter::BookmarkNodeFaviconChanged(BookmarkModel* model,
@@ -360,13 +360,13 @@
int childCount = node->child_count();
for (int i = 0; i < childCount; ++i) {
const BookmarkNode* child = node->GetChild(i);
- reorder_info.child_ids.push_back(base::Int64ToString(child->id()));
+ reorder_info.child_ids.push_back(base::NumberToString(child->id()));
}
DispatchEvent(events::BOOKMARKS_ON_CHILDREN_REORDERED,
api::bookmarks::OnChildrenReordered::kEventName,
api::bookmarks::OnChildrenReordered::Create(
- base::Int64ToString(node->id()), reorder_info));
+ base::NumberToString(node->id()), reorder_info));
}
void BookmarkEventRouter::ExtensiveBookmarkChangesBeginning(
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api_unittest.cc
index ba165a8..124c9b08 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api_unittest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api_unittest.cc
@@ -29,7 +29,7 @@
const bookmarks::BookmarkNode* node = model_->AddFolder(
model_->other_node(), 0, base::ASCIIToUTF16("Empty folder"));
- node_id_ = base::Int64ToString(node->id());
+ node_id_ = base::NumberToString(node->id());
}
std::string node_id() const { return node_id_; }
diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc
index 73d4dea..3e98be6 100644
--- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc
+++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc
@@ -285,7 +285,7 @@
}
EXPECT_GT(change_count, 0);
perf_test::PrintResult(name, modifier, "resolution_changes",
- base::IntToString(change_count), "count", true);
+ base::NumberToString(change_count), "count", true);
}
private:
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
index 909b6d1..f2343d7 100644
--- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
+++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
@@ -102,7 +102,7 @@
std::string JsUint8Array(const std::vector<uint8_t>& bytes) {
std::string res = "new Uint8Array([";
for (const uint8_t byte : bytes) {
- res += base::UintToString(byte);
+ res += base::NumberToString(byte);
res += ", ";
}
res += "])";
diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc
index 6da2221..f111105 100644
--- a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc
+++ b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc
@@ -34,7 +34,7 @@
if (id.uid == 0)
return id.string_uid;
else
- return base::IntToString(id.uid);
+ return base::NumberToString(id.uid);
}
MenuItem* GetParent(MenuItem::Id parent_id,
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index aeb35a53..257b977 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -403,7 +403,7 @@
if (debuggee_.tab_id)
error_ = ErrorUtils::FormatErrorMessage(
format, debugger_api_constants::kTabTargetType,
- base::IntToString(*debuggee_.tab_id));
+ base::NumberToString(*debuggee_.tab_id));
else if (debuggee_.extension_id)
error_ = ErrorUtils::FormatErrorMessage(
format, debugger_api_constants::kBackgroundPageTargetType,
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
index adc282b..106d9fb 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -59,7 +59,7 @@
protected:
GURL GetURLForPath(const std::string& host, const std::string& path) {
- std::string port = base::UintToString(embedded_test_server()->port());
+ std::string port = base::NumberToString(embedded_test_server()->port());
GURL::Replacements replacements;
replacements.SetHostStr(host);
replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index 8c6ba90e..4c48e78 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -344,7 +344,7 @@
include_incognito_information(), nullptr,
nullptr, &contents_, nullptr);
if (!contents_)
- return RespondNow(Error(kNoTabError, base::IntToString(tab_id_)));
+ return RespondNow(Error(kNoTabError, base::NumberToString(tab_id_)));
} else {
// Only browser actions and system indicators have a default tabId.
ActionInfo::Type action_type = extension_action_->action_type();
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc
index 80a80a9..9eb67c6 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc
@@ -26,7 +26,7 @@
// Install 5 extensions.
for (int i = 0; i < 5; i++) {
- std::string name = "test" + base::IntToString(i);
+ std::string name = "test" + base::NumberToString(i);
extensions_.push_back(prefs_.AddExtension(name));
}
diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc
index 8850cb6..8bbeeff6 100644
--- a/chrome/browser/extensions/api/history/history_api.cc
+++ b/chrome/browser/extensions/api/history/history_api.cc
@@ -64,7 +64,7 @@
HistoryItem GetHistoryItem(const history::URLRow& row) {
HistoryItem history_item;
- history_item.id = base::Int64ToString(row.id());
+ history_item.id = base::NumberToString(row.id());
history_item.url.reset(new std::string(row.url().spec()));
history_item.title.reset(new std::string(base::UTF16ToUTF8(row.title())));
history_item.last_visit_time.reset(
@@ -78,10 +78,10 @@
VisitItem GetVisitItem(const history::VisitRow& row) {
VisitItem visit_item;
- visit_item.id = base::Int64ToString(row.url_id);
- visit_item.visit_id = base::Int64ToString(row.visit_id);
+ visit_item.id = base::NumberToString(row.url_id);
+ visit_item.visit_id = base::NumberToString(row.visit_id);
visit_item.visit_time.reset(new double(MilliSecondsFromTime(row.visit_time)));
- visit_item.referring_visit_id = base::Int64ToString(row.referring_visit);
+ visit_item.referring_visit_id = base::NumberToString(row.referring_visit);
api::history::TransitionType transition = api::history::TRANSITION_TYPE_LINK;
switch (row.transition & ui::PAGE_TRANSITION_CORE_MASK) {
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc
index 0b60862..d2f3c29 100644
--- a/chrome/browser/extensions/api/processes/processes_api.cc
+++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -290,7 +290,7 @@
// Store each process indexed by the string version of its ChildProcessHost
// ID.
- processes_dictionary.Set(base::IntToString(child_process_host_id),
+ processes_dictionary.Set(base::NumberToString(child_process_host_id),
process.ToValue());
}
@@ -463,8 +463,8 @@
tab_id, Profile::FromBrowserContext(browser_context()),
include_incognito_information(), nullptr, nullptr, &contents,
&tab_index)) {
- return RespondNow(Error(tabs_constants::kTabNotFoundError,
- base::IntToString(tab_id)));
+ return RespondNow(
+ Error(tabs_constants::kTabNotFoundError, base::NumberToString(tab_id)));
}
// TODO(https://crbug.com/767563): chrome.processes.getProcessIdForTab API
@@ -489,11 +489,11 @@
child_process_host_id_ = params->process_id;
if (child_process_host_id_ < 0) {
return RespondNow(Error(errors::kInvalidArgument,
- base::IntToString(child_process_host_id_)));
+ base::NumberToString(child_process_host_id_)));
} else if (child_process_host_id_ == 0) {
// Cannot kill the browser process.
return RespondNow(Error(errors::kNotAllowedToTerminate,
- base::IntToString(child_process_host_id_)));
+ base::NumberToString(child_process_host_id_)));
}
// Check if it's a renderer.
@@ -538,19 +538,19 @@
ProcessesTerminateFunction::TerminateIfAllowed(base::ProcessHandle handle) {
if (handle == base::kNullProcessHandle) {
return Error(errors::kProcessNotFound,
- base::IntToString(child_process_host_id_));
+ base::NumberToString(child_process_host_id_));
}
if (handle == base::GetCurrentProcessHandle()) {
// Cannot kill the browser process.
return Error(errors::kNotAllowedToTerminate,
- base::IntToString(child_process_host_id_));
+ base::NumberToString(child_process_host_id_));
}
base::Process process = base::Process::Open(base::GetProcId(handle));
if (!process.IsValid()) {
return Error(errors::kProcessNotFound,
- base::IntToString(child_process_host_id_));
+ base::NumberToString(child_process_host_id_));
}
const bool did_terminate =
@@ -675,15 +675,15 @@
// Store each process indexed by the string version of its
// ChildProcessHost ID.
processes.additional_properties.Set(
- base::IntToString(child_process_host_id),
- process.ToValue());
+ base::NumberToString(child_process_host_id), process.ToValue());
}
// Report the invalid host ids sent in the arguments.
for (const auto& host_id : process_host_ids_) {
- WriteToConsole(content::CONSOLE_MESSAGE_LEVEL_ERROR,
- ErrorUtils::FormatErrorMessage(errors::kProcessNotFound,
- base::IntToString(host_id)));
+ WriteToConsole(
+ content::CONSOLE_MESSAGE_LEVEL_ERROR,
+ ErrorUtils::FormatErrorMessage(errors::kProcessNotFound,
+ base::NumberToString(host_id)));
}
// Send the response.
diff --git a/chrome/browser/extensions/api/sessions/session_id.cc b/chrome/browser/extensions/api/sessions/session_id.cc
index 1862a3da..e2ea1bd 100644
--- a/chrome/browser/extensions/api/sessions/session_id.cc
+++ b/chrome/browser/extensions/api/sessions/session_id.cc
@@ -43,9 +43,8 @@
}
std::string SessionId::ToString() const {
- return IsForeign() ?
- (session_tag_ + kIdSeparator + base::IntToString(id_))
- : base::IntToString(id_);
+ return IsForeign() ? (session_tag_ + kIdSeparator + base::NumberToString(id_))
+ : base::NumberToString(id_);
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc
index 493e7383..0fc0594 100644
--- a/chrome/browser/extensions/api/sessions/sessions_api.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -146,7 +146,7 @@
const sessions::TabRestoreService::Tab& tab,
bool active) {
return CreateTabModelHelper(tab.navigations[tab.current_navigation_index],
- base::IntToString(tab.id.id()),
+ base::NumberToString(tab.id.id()),
tab.tabstrip_index, tab.pinned, active,
extension());
}
@@ -162,7 +162,7 @@
CreateTabModel(*tab, tab->tabstrip_index == window.selected_tab_index));
return CreateWindowModelHelper(
- std::move(tabs), base::IntToString(window.id.id()),
+ std::move(tabs), base::NumberToString(window.id.id()),
api::windows::WINDOW_TYPE_NORMAL, api::windows::WINDOW_STATE_NORMAL);
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc
index 7a76483..4ad8cf0 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc
@@ -60,7 +60,7 @@
const base::Value *out_value;
do {
- string_value = base::IntToString(rand_value);
+ string_value = base::NumberToString(rand_value);
rand_value++;
} while (mapping.Get(string_value, &out_value));
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 7dcda11..d46189d 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -1427,7 +1427,7 @@
// permission can't apply to sync.
std::unique_ptr<base::Value> kilobyte = util::CreateKilobyte();
for (int i = 0; i < 100; ++i) {
- sync_storage->Set(ValueStore::DEFAULTS, base::IntToString(i), *kilobyte);
+ sync_storage->Set(ValueStore::DEFAULTS, base::NumberToString(i), *kilobyte);
}
EXPECT_FALSE(sync_storage->Set(ValueStore::DEFAULTS, "WillError", *kilobyte)
@@ -1439,7 +1439,8 @@
// Local storage should never run out.
std::unique_ptr<base::Value> megabyte = util::CreateMegabyte();
for (int i = 0; i < 7; ++i) {
- local_storage->Set(ValueStore::DEFAULTS, base::IntToString(i), *megabyte);
+ local_storage->Set(ValueStore::DEFAULTS, base::NumberToString(i),
+ *megabyte);
}
EXPECT_TRUE(local_storage->Set(ValueStore::DEFAULTS, "WontError", *megabyte)
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 0fbe38a..edfe45a3 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -187,7 +187,7 @@
if (error_message) {
*error_message = ErrorUtils::FormatErrorMessage(
- tabs_constants::kTabNotFoundError, base::IntToString(tab_id));
+ tabs_constants::kTabNotFoundError, base::NumberToString(tab_id));
}
return false;
@@ -1242,7 +1242,7 @@
// Make sure the index is in range.
if (!tabstrip->ContainsIndex(index)) {
*error = ErrorUtils::FormatErrorMessage(
- tabs_constants::kTabIndexNotFoundError, base::IntToString(index));
+ tabs_constants::kTabIndexNotFoundError, base::NumberToString(index));
return false;
}
@@ -1341,7 +1341,8 @@
!chrome::SetTabAudioMuted(contents, *params->update_properties.muted,
TabMutedReason::EXTENSION, extension()->id())) {
return RespondNow(Error(ErrorUtils::FormatErrorMessage(
- tabs_constants::kCannotUpdateMuteCaptured, base::IntToString(tab_id))));
+ tabs_constants::kCannotUpdateMuteCaptured,
+ base::NumberToString(tab_id))));
}
if (params->update_properties.opener_tab_id.get()) {
@@ -1353,7 +1354,7 @@
include_incognito_information(), nullptr,
nullptr, &opener_contents, nullptr)) {
return RespondNow(Error(ErrorUtils::FormatErrorMessage(
- tabs_constants::kTabNotFoundError, base::IntToString(opener_id))));
+ tabs_constants::kTabNotFoundError, base::NumberToString(opener_id))));
}
if (tab_strip->GetIndexOfWebContents(opener_contents) ==
@@ -1541,7 +1542,7 @@
source_tab_strip->DetachWebContentsAt(tab_index);
if (!web_contents) {
*error = ErrorUtils::FormatErrorMessage(
- tabs_constants::kTabNotFoundError, base::IntToString(tab_id));
+ tabs_constants::kTabNotFoundError, base::NumberToString(tab_id));
return false;
}
@@ -1945,9 +1946,9 @@
content::RenderFrameHost* rfh =
ExtensionApiFrameIdMap::GetRenderFrameHostById(contents, frame_id);
if (!rfh) {
- *error = ErrorUtils::FormatErrorMessage(tabs_constants::kFrameNotFoundError,
- base::IntToString(frame_id),
- base::IntToString(execute_tab_id_));
+ *error = ErrorUtils::FormatErrorMessage(
+ tabs_constants::kFrameNotFoundError, base::NumberToString(frame_id),
+ base::NumberToString(execute_tab_id_));
return false;
}
@@ -2173,11 +2174,11 @@
}
// Return appropriate error message otherwise.
- return RespondNow(Error(
- params->tab_id
- ? ErrorUtils::FormatErrorMessage(tabs_constants::kCannotDiscardTab,
- base::IntToString(*params->tab_id))
- : tabs_constants::kCannotFindTabToDiscard));
+ return RespondNow(Error(params->tab_id
+ ? ErrorUtils::FormatErrorMessage(
+ tabs_constants::kCannotDiscardTab,
+ base::NumberToString(*params->tab_id))
+ : tabs_constants::kCannotFindTabToDiscard));
}
TabsDiscardFunction::TabsDiscardFunction() {}
diff --git a/chrome/browser/extensions/api/tabs/windows_util.cc b/chrome/browser/extensions/api/tabs/windows_util.cc
index 17b7831..684183d 100644
--- a/chrome/browser/extensions/api/tabs/windows_util.cc
+++ b/chrome/browser/extensions/api/tabs/windows_util.cc
@@ -60,7 +60,7 @@
if (!(*browser)) {
*error = extensions::ErrorUtils::FormatErrorMessage(
extensions::tabs_constants::kWindowNotFoundError,
- base::IntToString(window_id));
+ base::NumberToString(window_id));
return false;
}
}
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index bcc9c3de..04714c4 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -361,7 +361,7 @@
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id(), false);
GURL url = extension->GetResourceURL(
- "a.html?" + base::IntToString(embedded_test_server()->port()));
+ "a.html?" + base::NumberToString(embedded_test_server()->port()));
// Register an observer for the navigation in the subframe, so the test
// can wait until it is fully complete. Otherwise the context menu
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
index a8204b98..b2ab47ed3 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
@@ -169,7 +169,7 @@
nullptr, &contents, nullptr)) {
error_ = extensions::ErrorUtils::FormatErrorMessage(
extensions::tabs_constants::kTabNotFoundError,
- base::IntToString(tab_id));
+ base::NumberToString(tab_id));
return nullptr;
}
GURL expected_origin = contents->GetLastCommittedURL().GetOrigin();
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
index 159e5fc..53de044f 100644
--- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
+++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -78,7 +78,7 @@
namespace {
std::string HashIdWithOrigin(const std::string& security_origin,
const std::string& log_id) {
- return base::UintToString(base::Hash(security_origin + log_id));
+ return base::NumberToString(base::Hash(security_origin + log_id));
}
} // namespace
@@ -154,7 +154,7 @@
nullptr, &contents, nullptr)) {
SetError(extensions::ErrorUtils::FormatErrorMessage(
extensions::tabs_constants::kTabNotFoundError,
- base::IntToString(tab_id)));
+ base::NumberToString(tab_id)));
return nullptr;
}
if (!contents) {
diff --git a/chrome/browser/extensions/content_capabilities_browsertest.cc b/chrome/browser/extensions/content_capabilities_browsertest.cc
index 89d1b0e..d635c6c8 100644
--- a/chrome/browser/extensions/content_capabilities_browsertest.cc
+++ b/chrome/browser/extensions/content_capabilities_browsertest.cc
@@ -98,7 +98,7 @@
}
GURL GetTestURLFor(const std::string& host) {
- std::string port = base::UintToString(embedded_test_server()->port());
+ std::string port = base::NumberToString(embedded_test_server()->port());
GURL::Replacements replacements;
replacements.SetHostStr(host);
replacements.SetPortStr(port);
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 19e98f7..d42bee15 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -146,9 +146,9 @@
bool RunSubtest(const std::string& test_host) {
return RunExtensionSubtest(
"executescript/destructive",
- "test.html?" + test_host +
- "#bucketcount=" + base::IntToString(kDestructiveScriptTestBucketCount) +
- "&bucketindex=" + base::IntToString(GetParam()));
+ "test.html?" + test_host + "#bucketcount=" +
+ base::NumberToString(kDestructiveScriptTestBucketCount) +
+ "&bucketindex=" + base::NumberToString(GetParam()));
}
};
diff --git a/chrome/browser/extensions/extension_action_manager_unittest.cc b/chrome/browser/extensions/extension_action_manager_unittest.cc
index 9b5efa0..f106f04 100644
--- a/chrome/browser/extensions/extension_action_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_action_manager_unittest.cc
@@ -75,7 +75,7 @@
std::unique_ptr<base::DictionaryValue> extension_icons,
std::unique_ptr<base::DictionaryValue> action,
const char* action_type) {
- std::string id = base::IntToString(curr_id_++);
+ std::string id = base::NumberToString(curr_id_++);
scoped_refptr<const Extension> extension =
ExtensionBuilder()
.SetManifest(
diff --git a/chrome/browser/extensions/extension_action_storage_manager.cc b/chrome/browser/extensions/extension_action_storage_manager.cc
index 2842143..bc5a9ac 100644
--- a/chrome/browser/extensions/extension_action_storage_manager.cc
+++ b/chrome/browser/extensions/extension_action_storage_manager.cc
@@ -184,7 +184,7 @@
std::vector<gfx::ImageSkiaRep> image_reps = icon.image_reps();
for (const gfx::ImageSkiaRep& rep : image_reps) {
int size = static_cast<int>(rep.scale() * icon.width());
- std::string size_string = base::IntToString(size);
+ std::string size_string = base::NumberToString(size);
icon_value->SetString(size_string, BitmapToString(rep.GetBitmap()));
}
dict->Set(kIconStorageKey, std::move(icon_value));
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 465f5a4..c445a39 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -394,7 +394,7 @@
base::string16 ExtensionInstallPrompt::Prompt::GetRatingCount() const {
CHECK(AllowWebstoreData(type_));
return l10n_util::GetStringFUTF16(IDS_EXTENSION_RATING_COUNT,
- base::IntToString16(rating_count_));
+ base::NumberToString16(rating_count_));
}
base::string16 ExtensionInstallPrompt::Prompt::GetUserCount() const {
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 4034bbb..b321c50 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -152,8 +152,8 @@
int old_size = extension_list.size();
extension_list.erase(extension_list.begin() + kMaxExtensionsToShow,
extension_list.end());
- extension_list.push_back(delegate_->GetOverflowText(base::IntToString16(
- old_size - kMaxExtensionsToShow)));
+ extension_list.push_back(delegate_->GetOverflowText(
+ base::NumberToString16(old_size - kMaxExtensionsToShow)));
}
const base::char16 bullet_point = 0x2022;
base::string16 prefix = bullet_point + base::ASCIIToUTF16(" ");
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index 7deff738..be310c0 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -1188,7 +1188,7 @@
void SetInstallTime(const std::string& extension_id,
const base::Time& time,
ExtensionPrefs* prefs) {
- std::string time_str = base::Int64ToString(time.ToInternalValue());
+ std::string time_str = base::NumberToString(time.ToInternalValue());
prefs->UpdateExtensionPref(extension_id, "install_time",
std::make_unique<base::Value>(time_str));
}
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index a2d7726..043747c 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -371,7 +371,7 @@
}
GURL GetURLForPath(const std::string& host, const std::string& path) {
- std::string port = base::UintToString(embedded_test_server()->port());
+ std::string port = base::NumberToString(embedded_test_server()->port());
GURL::Replacements replacements;
replacements.SetHostStr(host);
replacements.SetPortStr(port);
@@ -669,13 +669,13 @@
ui_test_utils::NavigateToURL(browser(), google_com_url());
// The extension requests the TLS channel ID, but it doesn't get it for a
// site that can't connect to it, regardless of whether the page asks for it.
- EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED),
+ EXPECT_EQ(base::NumberToString(NAMESPACE_NOT_DEFINED),
GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false));
- EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED),
+ EXPECT_EQ(base::NumberToString(NAMESPACE_NOT_DEFINED),
GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true));
- EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED),
+ EXPECT_EQ(base::NumberToString(NAMESPACE_NOT_DEFINED),
GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false));
- EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED),
+ EXPECT_EQ(base::NumberToString(NAMESPACE_NOT_DEFINED),
GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true));
}
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index ba6b127..4b7ef8df 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -384,7 +384,7 @@
// Install some extensions.
for (int i = 0; i < 5; i++) {
- std::string name = "test" + base::IntToString(i);
+ std::string name = "test" + base::NumberToString(i);
extensions_.push_back(prefs_.AddExtension(name));
}
EXPECT_EQ(NULL,
@@ -447,10 +447,11 @@
void SetIdleInfo(const std::string& id, int num) {
base::DictionaryValue manifest;
manifest.SetString(manifest_keys::kName, "test");
- manifest.SetString(manifest_keys::kVersion, "1." + base::IntToString(num));
+ manifest.SetString(manifest_keys::kVersion,
+ "1." + base::NumberToString(num));
manifest.SetInteger(manifest_keys::kManifestVersion, 2);
base::FilePath path =
- prefs_.extensions_dir().AppendASCII(base::IntToString(num));
+ prefs_.extensions_dir().AppendASCII(base::NumberToString(num));
std::string errors;
scoped_refptr<Extension> extension = Extension::Create(
path, Manifest::INTERNAL, manifest, Extension::NO_FLAGS, id, &errors);
@@ -471,8 +472,8 @@
ASSERT_TRUE(info);
std::string version;
ASSERT_TRUE(info->extension_manifest->GetString("version", &version));
- ASSERT_EQ("1." + base::IntToString(num), version);
- ASSERT_EQ(base::IntToString(num),
+ ASSERT_EQ("1." + base::NumberToString(num), version);
+ ASSERT_EQ(base::NumberToString(num),
info->extension_path.BaseName().MaybeAsASCII());
}
diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc
index fe669f3..31a5fbd 100644
--- a/chrome/browser/extensions/extension_service_test_base.cc
+++ b/chrome/browser/extensions/extension_service_test_base.cc
@@ -242,9 +242,9 @@
const std::string& extension_id,
const std::string& pref_path,
int expected_val) {
- std::string msg = base::StringPrintf("while checking: %s %s == %s",
- extension_id.c_str(), pref_path.c_str(),
- base::IntToString(expected_val).c_str());
+ std::string msg = base::StringPrintf(
+ "while checking: %s %s == %s", extension_id.c_str(), pref_path.c_str(),
+ base::NumberToString(expected_val).c_str());
PrefService* prefs = profile()->GetPrefs();
const base::DictionaryValue* dict =
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index ec17434..30fd86c1 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -696,7 +696,7 @@
msg += " ";
msg += pref_path;
msg += " = ";
- msg += base::IntToString(value);
+ msg += base::NumberToString(value);
SetPref(extension_id, pref_path, std::make_unique<base::Value>(value), msg);
}
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index 61ab8bb..50f7a416 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -427,7 +427,7 @@
l10n_util::GetStringFUTF16(
IDS_EXTENSION_STORAGE_MONITOR_TEXT,
base::UTF8ToUTF16(extension->name()),
- base::Int64ToString16(current_usage / kMBytes)),
+ base::NumberToString16(current_usage / kMBytes)),
notification_image, base::string16() /* display source */, GURL(),
message_center::NotifierId(message_center::NotifierType::SYSTEM_COMPONENT,
kSystemNotifierId),
@@ -574,7 +574,7 @@
extension_prefs_->UpdateExtensionPref(
extension_id, kPrefNextStorageThreshold,
next_threshold > 0
- ? std::make_unique<base::Value>(base::Int64ToString(next_threshold))
+ ? std::make_unique<base::Value>(base::NumberToString(next_threshold))
: nullptr);
}
diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
index 29596dd..2f7c189 100644
--- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
+++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
@@ -254,7 +254,7 @@
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
// Instruct the app to write |num_bytes| of data.
- launched_listener.Reply(base::IntToString(num_bytes));
+ launched_listener.Reply(base::NumberToString(num_bytes));
ASSERT_TRUE(write_complete_listener.WaitUntilSatisfied());
}
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 306050ea..b08a21c 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -81,7 +81,7 @@
if (error_message)
*error_message = ErrorUtils::FormatErrorMessage(
- tabs_constants::kWindowNotFoundError, base::IntToString(window_id));
+ tabs_constants::kWindowNotFoundError, base::NumberToString(window_id));
return nullptr;
}
@@ -172,7 +172,7 @@
&opener_browser, nullptr, &opener, nullptr)) {
if (error) {
*error = ErrorUtils::FormatErrorMessage(
- tabs_constants::kTabNotFoundError, base::IntToString(opener_id));
+ tabs_constants::kTabNotFoundError, base::NumberToString(opener_id));
}
return nullptr;
}
diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc
index 57125cb6..b4f6108e 100644
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc
@@ -176,7 +176,7 @@
value->SetString(kSaltKey, salt_base64);
value->SetString(kSignatureKey, signature_base64);
value->SetString(kTimestampKey,
- base::Int64ToString(timestamp.ToInternalValue()));
+ base::NumberToString(timestamp.ToInternalValue()));
}
// static
diff --git a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
index 602b808..86d1373 100644
--- a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
@@ -489,7 +489,7 @@
ASSERT_EQ(1u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id), result[0].id);
EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(270, result[0].rotation);
@@ -501,7 +501,7 @@
ASSERT_EQ(1u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id), result[0].id);
EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(180, result[0].rotation);
@@ -513,7 +513,7 @@
ASSERT_EQ(1u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id), result[0].id);
EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(0, result[0].rotation);
}
@@ -573,7 +573,7 @@
ASSERT_EQ(2u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id), result[1].id);
+ EXPECT_EQ(base::NumberToString(display_id), result[1].id);
EXPECT_EQ("304,0 310x450", SystemInfoDisplayBoundsToString(result[1].bounds));
EXPECT_EQ("20,30,50,60", SystemInfoDisplayInsetsToString(result[1].overscan));
@@ -591,7 +591,7 @@
ASSERT_EQ(2u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id), result[0].id);
EXPECT_EQ("0,0 260x320", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ("10,20,30,40", SystemInfoDisplayInsetsToString(result[0].overscan));
}
@@ -626,8 +626,8 @@
result = GetAllDisplaysInfo();
ASSERT_EQ(1u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id_primary), result[0].id);
- EXPECT_EQ(base::Int64ToString(display_id_primary),
+ EXPECT_EQ(base::NumberToString(display_id_primary), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id_primary),
result[0].mirroring_source_id);
GetDisplayManager()->SetMirrorMode(display::MirrorMode::kOff, base::nullopt);
@@ -636,9 +636,9 @@
result = GetAllDisplaysInfo();
ASSERT_EQ(2u, result.size());
- EXPECT_EQ(base::Int64ToString(display_id_primary), result[0].id);
+ EXPECT_EQ(base::NumberToString(display_id_primary), result[0].id);
EXPECT_TRUE(result[0].mirroring_source_id.empty());
- EXPECT_EQ(base::Int64ToString(display_id_secondary), result[1].id);
+ EXPECT_EQ(base::NumberToString(display_id_secondary), result[1].id);
EXPECT_TRUE(result[1].mirroring_source_id.empty());
}
@@ -814,7 +814,7 @@
// called first.
info.is_unified = std::make_unique<bool>(true);
EXPECT_FALSE(CallSetDisplayUnitInfo(
- base::Int64ToString(
+ base::NumberToString(
display::Screen::GetScreen()->GetPrimaryDisplay().id()),
info));
base::RunLoop().RunUntilIdle();
@@ -831,7 +831,7 @@
// enabled.
info.is_unified = std::make_unique<bool>(false);
EXPECT_TRUE(CallSetDisplayUnitInfo(
- base::Int64ToString(
+ base::NumberToString(
display::Screen::GetScreen()->GetPrimaryDisplay().id()),
info));
EXPECT_FALSE(GetDisplayManager()->IsInUnifiedMode());
@@ -840,7 +840,7 @@
// EnableUnifiedDesktop.
info.is_unified = std::make_unique<bool>(true);
EXPECT_TRUE(CallSetDisplayUnitInfo(
- base::Int64ToString(
+ base::NumberToString(
display::Screen::GetScreen()->GetPrimaryDisplay().id()),
info));
EXPECT_TRUE(GetDisplayManager()->IsInUnifiedMode());
@@ -906,7 +906,7 @@
info.bounds_origin_y.reset(new int(50));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-520,50 520x400", secondary.bounds().ToString());
}
@@ -920,7 +920,7 @@
info.bounds_origin_y.reset(new int(100));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,100 520x400", secondary.bounds().ToString());
}
@@ -934,7 +934,7 @@
info.bounds_origin_y.reset(new int(-400));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1100,-400 520x400", secondary.bounds().ToString());
}
@@ -948,7 +948,7 @@
info.bounds_origin_y.reset(new int(600));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-350,600 520x400", secondary.bounds().ToString());
}
@@ -962,7 +962,7 @@
info.bounds_origin_y.reset(new int(100));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,100 520x400", secondary.bounds().ToString());
}
@@ -976,7 +976,7 @@
info.bounds_origin_y.reset(new int(100));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-520,100 520x400", secondary.bounds().ToString());
}
@@ -990,7 +990,7 @@
info.bounds_origin_y.reset(new int(-301));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-360,-400 520x400", secondary.bounds().ToString());
}
@@ -1005,7 +1005,7 @@
info.bounds_origin_y.reset(new int(700));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-650,600 1000x100", secondary.bounds().ToString());
}
@@ -1019,7 +1019,7 @@
info.bounds_origin_y.reset(new int(-150));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("850,-100 1000x100", secondary.bounds().ToString());
}
@@ -1033,7 +1033,7 @@
info.bounds_origin_y.reset(new int(-650));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("-100,-650 100x1000", secondary.bounds().ToString());
}
@@ -1048,7 +1048,7 @@
info.bounds_origin_y.reset(new int(450));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,450 100x1000", secondary.bounds().ToString());
}
@@ -1062,7 +1062,7 @@
info.bounds_origin_y.reset(new int(-100));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("600,-100 500x500", secondary.bounds().ToString());
}
@@ -1076,7 +1076,7 @@
info.bounds_origin_y.reset(new int(-100));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("450,-500 300x500", secondary.bounds().ToString());
}
@@ -1090,7 +1090,7 @@
info.bounds_origin_y.reset(new int(-100));
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
}
@@ -1104,7 +1104,7 @@
info.bounds_origin_y.reset(new int(-0x200001));
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
}
@@ -1118,7 +1118,7 @@
info.bounds_origin_y.reset(new int(10));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,10 300x500", secondary.bounds().ToString());
}
@@ -1132,7 +1132,7 @@
info.is_primary.reset(new bool(true));
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
// The operation failed because the primary property would be set before
@@ -1151,10 +1151,10 @@
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.mirroring_source_id.reset(
- new std::string(base::Int64ToString(primary.id())));
+ new std::string(base::NumberToString(primary.id())));
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
}
TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
@@ -1165,14 +1165,14 @@
info.rotation.reset(new int(90));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString());
EXPECT_EQ(display::Display::ROTATE_90, secondary.rotation());
info.rotation.reset(new int(270));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString());
EXPECT_EQ(display::Display::ROTATE_270, secondary.rotation());
@@ -1181,7 +1181,7 @@
// Switch primary display.
info.is_primary.reset(new bool(true));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
EXPECT_EQ(display::Display::ROTATE_180, secondary.rotation());
@@ -1190,7 +1190,7 @@
info.rotation.reset(new int(0));
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
EXPECT_EQ(display::Display::ROTATE_0, secondary.rotation());
@@ -1207,7 +1207,7 @@
info.rotation.reset(new int(90));
EXPECT_TRUE(CallSetDisplayUnitInfo(
- base::Int64ToString(display::Display::InternalDisplayId()), info));
+ base::NumberToString(display::Display::InternalDisplayId()), info));
EXPECT_FALSE(screen_orientation_controller->rotation_locked());
// Entering tablet mode enables accelerometer screen rotations.
@@ -1244,7 +1244,7 @@
info.rotation.reset(new int(90));
EXPECT_TRUE(CallSetDisplayUnitInfo(
- base::Int64ToString(display::Display::InternalDisplayId()), info));
+ base::NumberToString(display::Display::InternalDisplayId()), info));
EXPECT_TRUE(
ash::Shell::Get()->screen_orientation_controller()->rotation_locked());
EXPECT_TRUE(ash::Shell::Get()
@@ -1260,7 +1260,7 @@
info.rotation.reset(new int(91));
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
}
TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
@@ -1272,7 +1272,7 @@
info.overscan->left = -10;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
@@ -1280,7 +1280,7 @@
info.overscan->right = -200;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
@@ -1288,7 +1288,7 @@
info.overscan->top = -300;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
@@ -1296,7 +1296,7 @@
info.overscan->top = -1000;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
@@ -1304,7 +1304,7 @@
info.overscan->top = 0;
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
}
@@ -1322,7 +1322,7 @@
info.overscan->bottom = 20;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
}
TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
@@ -1338,7 +1338,7 @@
info.overscan->bottom = 251;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
}
TEST_F(DisplayInfoProviderChromeosTest, SetOverscan) {
@@ -1353,7 +1353,7 @@
info.overscan->bottom = 51;
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(secondary.id()), info));
+ CallSetDisplayUnitInfo(base::NumberToString(secondary.id()), info));
EXPECT_EQ("1200,0 150x250", secondary.bounds().ToString());
const gfx::Insets overscan =
@@ -1380,7 +1380,7 @@
info.overscan->bottom = 20;
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(internal_display_id), info));
+ CallSetDisplayUnitInfo(base::NumberToString(internal_display_id), info));
}
TEST_F(DisplayInfoProviderChromeosTest, DisplayMode) {
@@ -1425,7 +1425,7 @@
info.display_mode =
api::system_display::DisplayMode::FromValue(*other_mode->ToValue());
- EXPECT_TRUE(CallSetDisplayUnitInfo(base::Int64ToString(id), info));
+ EXPECT_TRUE(CallSetDisplayUnitInfo(base::NumberToString(id), info));
// Verify that other_mode now matches the active mode.
EXPECT_TRUE(GetDisplayManager()->GetActiveModeForDisplayId(id, &active_mode));
@@ -1445,9 +1445,9 @@
DisplayUnitInfoList displays = GetAllDisplaysInfo();
for (const auto& display : displays) {
- if (display.id == base::Int64ToString(display_id_list[0]))
+ if (display.id == base::NumberToString(display_id_list[0]))
EXPECT_EQ(display.display_zoom_factor, zoom_factor_1);
- if (display.id == base::Int64ToString(display_id_list[1]))
+ if (display.id == base::NumberToString(display_id_list[1]))
EXPECT_EQ(display.display_zoom_factor, zoom_factor_2);
}
}
@@ -1474,7 +1474,7 @@
info.display_zoom_factor = std::make_unique<double>(zoom_factor_1);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[0]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[0]), info));
EXPECT_EQ(GetDisplayZoom(display_id_list[0]), final_zoom_factor_1);
// Display 2 has not been updated yet, so it will still have the old zoom
@@ -1483,7 +1483,7 @@
info.display_zoom_factor = std::make_unique<double>(zoom_factor_2);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[1]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[1]), info));
// Both displays should now have the correct zoom factor set.
EXPECT_EQ(GetDisplayZoom(display_id_list[0]), final_zoom_factor_1);
@@ -1494,14 +1494,14 @@
float invalid_zoom_factor_1 = 0.285f;
info.display_zoom_factor = std::make_unique<double>(invalid_zoom_factor_1);
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[0]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[0]), info));
// This zoom factor when applied to the display with width 1200, will result
// in an effective width greater less than 640, which is out of range.
float invalid_zoom_factor_2 = 1.88f;
info.display_zoom_factor = std::make_unique<double>(invalid_zoom_factor_2);
EXPECT_FALSE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[0]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[0]), info));
// Initialize displays that have bounds outside the valid width range of 640px
// to 4096px.
@@ -1515,7 +1515,7 @@
float valid_zoom_factor_1 = 0.8f;
info.display_zoom_factor = std::make_unique<double>(valid_zoom_factor_1);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[0]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[0]), info));
// Results in a logical width of 4200px. This is above the 4096px threshold
// but is valid because the initial width was 4500px, so logical width of up
@@ -1523,17 +1523,17 @@
float valid_zoom_factor_2 = 1.07f;
info.display_zoom_factor = std::make_unique<double>(valid_zoom_factor_2);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[1]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[1]), info));
float valid_zoom_factor_3 = 0.5f;
info.display_zoom_factor = std::make_unique<double>(valid_zoom_factor_3);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[0]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[0]), info));
float valid_zoom_factor_4 = 2.f;
info.display_zoom_factor = std::make_unique<double>(valid_zoom_factor_4);
EXPECT_TRUE(
- CallSetDisplayUnitInfo(base::Int64ToString(display_id_list[1]), info));
+ CallSetDisplayUnitInfo(base::NumberToString(display_id_list[1]), info));
}
class DisplayInfoProviderChromeosTouchviewTest
@@ -1643,7 +1643,7 @@
api::system_display::MirrorModeInfo info;
info.mode = api::system_display::MIRROR_MODE_MIXED;
info.mirroring_source_id.reset(
- new std::string(base::Int64ToString(id_list[0])));
+ new std::string(base::NumberToString(id_list[0])));
info.mirroring_destination_ids.reset(new std::vector<std::string>());
EXPECT_FALSE(SetMirrorMode(info));
}
@@ -1653,10 +1653,10 @@
api::system_display::MirrorModeInfo info;
info.mode = api::system_display::MIRROR_MODE_MIXED;
info.mirroring_source_id.reset(
- new std::string(base::Int64ToString(id_list[0])));
+ new std::string(base::NumberToString(id_list[0])));
info.mirroring_destination_ids.reset(new std::vector<std::string>());
info.mirroring_destination_ids->emplace_back(
- base::Int64ToString(display::kInvalidDisplayId));
+ base::NumberToString(display::kInvalidDisplayId));
EXPECT_FALSE(SetMirrorMode(info));
}
@@ -1665,10 +1665,10 @@
api::system_display::MirrorModeInfo info;
info.mode = api::system_display::MIRROR_MODE_MIXED;
info.mirroring_source_id.reset(
- new std::string(base::Int64ToString(id_list[0])));
+ new std::string(base::NumberToString(id_list[0])));
info.mirroring_destination_ids.reset(new std::vector<std::string>());
info.mirroring_destination_ids->emplace_back(
- base::Int64ToString(id_list[0]));
+ base::NumberToString(id_list[0]));
EXPECT_FALSE(SetMirrorMode(info));
}
@@ -1678,10 +1678,10 @@
api::system_display::MirrorModeInfo info;
info.mode = api::system_display::MIRROR_MODE_MIXED;
info.mirroring_source_id.reset(
- new std::string(base::Int64ToString(id_list[0])));
+ new std::string(base::NumberToString(id_list[0])));
info.mirroring_destination_ids.reset(new std::vector<std::string>());
info.mirroring_destination_ids->emplace_back(
- base::Int64ToString(id_list[1]));
+ base::NumberToString(id_list[1]));
EXPECT_TRUE(SetMirrorMode(info));
EXPECT_TRUE(display_manager()->IsInSoftwareMirrorMode());
EXPECT_EQ(id_list[0], display_manager()->mirroring_source_id());
diff --git a/chrome/browser/extensions/system_display/display_info_provider_win.cc b/chrome/browser/extensions/system_display/display_info_provider_win.cc
index 9f195b91..065fef7 100644
--- a/chrome/browser/extensions/system_display/display_info_provider_win.cc
+++ b/chrome/browser/extensions/system_display/display_info_provider_win.cc
@@ -43,7 +43,7 @@
return FALSE;
unit.id =
- base::Int64ToString(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
+ base::NumberToString(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
unit.name = base::WideToUTF8(device.DeviceString);
all_displays->push_back(std::move(unit));
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 2d8d76f..011f106 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -2029,14 +2029,14 @@
if (rollcall_ping_days != 0) {
ASSERT_TRUE(base::ContainsKey(url1_params, "r"));
ASSERT_EQ(1u, url1_params["r"].size());
- EXPECT_EQ(base::IntToString(rollcall_ping_days),
+ EXPECT_EQ(base::NumberToString(rollcall_ping_days),
*url1_params["r"].begin());
did_rollcall = true;
}
if (active_bit && active_ping_days != 0 && did_rollcall) {
ASSERT_TRUE(base::ContainsKey(url1_params, "a"));
ASSERT_EQ(1u, url1_params["a"].size());
- EXPECT_EQ(base::IntToString(active_ping_days),
+ EXPECT_EQ(base::NumberToString(active_ping_days),
*url1_params["a"].begin());
}
diff --git a/chrome/browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc b/chrome/browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc
index e49ef4d..a35725ed 100644
--- a/chrome/browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc
+++ b/chrome/browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc
@@ -149,7 +149,7 @@
"name:bookmark_clicked;comparator:any;window:3650;storage:3650";
bookmark_params["session_rate"] = "<=3";
bookmark_params["availability"] = "any";
- bookmark_params["x_date_released_in_seconds"] = base::Int64ToString(
+ bookmark_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
SetFeatureParams(kIPHBookmarkFeature, bookmark_params);
diff --git a/chrome/browser/feature_engagement/feature_tracker_unittest.cc b/chrome/browser/feature_engagement/feature_tracker_unittest.cc
index b5538960..72ac55b 100644
--- a/chrome/browser/feature_engagement/feature_tracker_unittest.cc
+++ b/chrome/browser/feature_engagement/feature_tracker_unittest.cc
@@ -265,7 +265,7 @@
TEST_F(FeatureTrackerParamsTest, TestIsNewUser_DefaultTime) {
// Setting the experiment timestamp equal to the first run sentinel timestamp.
std::map<std::string, std::string> new_tab_params;
- new_tab_params["x_date_released_in_seconds"] = base::Int64ToString(
+ new_tab_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
SetFeatureParams(kIPHNewTabFeature, new_tab_params);
@@ -282,7 +282,7 @@
// Setting the experiment timestamp equal to one second older than what is
// considered a new user.
std::map<std::string, std::string> new_tab_params;
- new_tab_params["x_date_released_in_seconds"] = base::Int64ToString(
+ new_tab_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT() +
base::TimeDelta::FromHours(24).InSeconds() + 1);
SetFeatureParams(kIPHNewTabFeature, new_tab_params);
@@ -303,7 +303,7 @@
// Setting the experiment timestamp equal to the limit of what is considered a
// new user.
- new_tab_params["x_date_released_in_seconds"] = base::Int64ToString(
+ new_tab_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
SetFeatureParams(kIPHNewTabFeature, new_tab_params);
@@ -323,7 +323,7 @@
// Setting the experiment timestamp equal to one second older than what is
// considered a new user.
- new_tab_params["x_date_released_in_seconds"] = base::Int64ToString(
+ new_tab_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT() +
base::TimeDelta::FromHours(28).InSeconds() + 1);
SetFeatureParams(kIPHNewTabFeature, new_tab_params);
diff --git a/chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc b/chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc
index 7b4f4cb..056f3b62 100644
--- a/chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc
+++ b/chrome/browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc
@@ -152,8 +152,9 @@
"name:incognito_window_clicked;comparator:any;window:3650;storage:3650";
incognito_window_params["session_rate"] = "<=3";
incognito_window_params["availability"] = "any";
- incognito_window_params["x_date_released_in_seconds"] = base::Int64ToString(
- first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
+ incognito_window_params["x_date_released_in_seconds"] =
+ base::NumberToString(
+ first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
SetFeatureParams(kIPHIncognitoWindowFeature, incognito_window_params);
// Start the DesktopSessionDurationTracker to track active session time.
diff --git a/chrome/browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc b/chrome/browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc
index 22d2eaf..b0e75048 100644
--- a/chrome/browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc
+++ b/chrome/browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc
@@ -159,7 +159,7 @@
"name:new_tab_clicked;comparator:any;window:3650;storage:3650";
new_tab_params["session_rate"] = "<=3";
new_tab_params["availability"] = "any";
- new_tab_params["x_date_released_in_seconds"] = base::Int64ToString(
+ new_tab_params["x_date_released_in_seconds"] = base::NumberToString(
first_run::GetFirstRunSentinelCreationTime().ToDoubleT());
SetFeatureParams(kIPHNewTabFeature, new_tab_params);
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 2d51206..3de86fc 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -45,7 +45,7 @@
namespace {
std::string GetErrorCodePermissionDenied() {
- return base::IntToString(static_cast<int>(
+ return base::NumberToString(static_cast<int>(
device::mojom::Geoposition::ErrorCode::PERMISSION_DENIED));
}
diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc
index cdbff42f7c..74d9c74 100644
--- a/chrome/browser/internal_auth.cc
+++ b/chrome/browser/internal_auth.cc
@@ -161,7 +161,7 @@
blob = domain + kItemSeparator;
std::string tmp;
ConvertVarValueMapToBlob(map, &tmp);
- blob += tmp + kItemSeparator + base::Int64ToString(tick);
+ blob += tmp + kItemSeparator + base::NumberToString(tick);
std::string hmac;
unsigned char* hmac_data = reinterpret_cast<unsigned char*>(
@@ -179,7 +179,7 @@
DCHECK(hmac_base64.size() < result.size());
std::copy(hmac_base64.begin(), hmac_base64.end(), result.begin());
- std::string tick_decimal = base::Int64ToString(tick);
+ std::string tick_decimal = base::NumberToString(tick);
DCHECK(tick_decimal.size() <= kTickStringLength);
std::copy(
tick_decimal.begin(),
diff --git a/chrome/browser/lifetime/browser_shutdown.cc b/chrome/browser/lifetime/browser_shutdown.cc
index 5035fcda..df66836 100644
--- a/chrome/browser/lifetime/browser_shutdown.cc
+++ b/chrome/browser/lifetime/browser_shutdown.cc
@@ -267,7 +267,7 @@
// We can't use prefs since all services are shutdown at this point.
TimeDelta shutdown_delta = base::Time::Now() - *g_shutdown_started;
std::string shutdown_ms =
- base::Int64ToString(shutdown_delta.InMilliseconds());
+ base::NumberToString(shutdown_delta.InMilliseconds());
int len = static_cast<int>(shutdown_ms.length()) + 1;
base::FilePath shutdown_ms_file = GetShutdownMsPath();
// Note: ReadLastShutdownFile() is done as a BLOCK_SHUTDOWN task so there's
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
index 657a80a..98dcfba 100644
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate_browsertest.cc
@@ -368,7 +368,7 @@
// Note we need to replace the port of the redirect's URL.
base::StringPairs replacement_text;
replacement_text.push_back(std::make_pair(
- "{{PORT}}", base::UintToString(embedded_test_server()->port())));
+ "{{PORT}}", base::NumberToString(embedded_test_server()->port())));
std::string replacement_path = net::test_server::GetFilePathWithReplacements(
"/mirror_request_header/http.www.google.com.html", replacement_text);
all_tests.push_back(
@@ -386,7 +386,7 @@
// First one should have the header, but not transfered to second one.
replacement_text.clear();
replacement_text.push_back(
- std::make_pair("{{PORT}}", base::UintToString(https_server.port())));
+ std::make_pair("{{PORT}}", base::NumberToString(https_server.port())));
replacement_path = net::test_server::GetFilePathWithReplacements(
"/mirror_request_header/https.www.google.com.html", replacement_text);
all_tests.push_back({https_server.GetURL("www.google.com", replacement_path),
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index fd2c1c0a..be4fc9e 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -356,7 +356,7 @@
// Override enabled CDM interface version for testing.
command_line->AppendSwitchASCII(
switches::kOverrideEnabledCdmInterfaceVersion,
- base::IntToString(GetCdmInterfaceVersion()));
+ base::NumberToString(GetCdmInterfaceVersion()));
}
};
@@ -423,7 +423,7 @@
query_params.emplace_back("keySystem", CurrentKeySystem());
query_params.emplace_back(
"configChangeType",
- base::IntToString(static_cast<int>(config_change_type)));
+ base::NumberToString(static_cast<int>(config_change_type)));
RunEncryptedMediaTestPage("mse_config_change.html", CurrentKeySystem(),
query_params, media::kEnded);
}
diff --git a/chrome/browser/media/media_engagement_preloaded_list.cc b/chrome/browser/media/media_engagement_preloaded_list.cc
index 2d12fbb..d43d579 100644
--- a/chrome/browser/media/media_engagement_preloaded_list.cc
+++ b/chrome/browser/media/media_engagement_preloaded_list.cc
@@ -111,7 +111,7 @@
if (origin.port() != url::DefaultPortForScheme(origin.scheme().data(),
origin.scheme().length())) {
location.push_back(':');
- std::string port(base::UintToString(origin.port()));
+ std::string port(base::NumberToString(origin.port()));
location.append(std::move(port));
}
diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrome/browser/media/router/discovery/dial/dial_registry.cc
index e8abdc1..f71e64e0 100644
--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
@@ -292,7 +292,7 @@
std::string DialRegistry::NextLabel() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- return base::IntToString(++label_count_);
+ return base::NumberToString(++label_count_);
}
void DialRegistry::OnDiscoveryRequest(DialService* service) {
diff --git a/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc b/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc
index 62ad5a85..fc8575b 100644
--- a/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc
+++ b/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc
@@ -37,7 +37,7 @@
uint64_t audio_debug_recordings_id) {
static const char kAudioDebugRecordingsFilePrefix[] = "AudioDebugRecordings.";
return directory.AppendASCII(kAudioDebugRecordingsFilePrefix +
- base::Int64ToString(audio_debug_recordings_id));
+ base::NumberToString(audio_debug_recordings_id));
}
base::FilePath GetLogDirectoryAndEnsureExists(
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
index 24c2b42..7d5d9a4 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
@@ -23,7 +23,7 @@
content::DesktopMediaID media_id) {
Source source;
source.id = media_id;
- source.name = base::Int64ToString16(media_id.id);
+ source.name = base::NumberToString16(media_id.id);
sources_.push_back(source);
observer_->OnSourceAdded(this, sources_.size() - 1);
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
index 6666449..b77b6c7 100644
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -671,10 +671,11 @@
base::UmaHistogramSparse("WebRtcTextLogging.UploadFailureNetErrorCode",
network_error_code);
}
- error_message = base::StrCat(
- {"Uploading failed, response code: ",
- response_code.has_value() ? base::IntToString(response_code.value())
- : "<no value>"});
+ error_message =
+ base::StrCat({"Uploading failed, response code: ",
+ response_code.has_value()
+ ? base::NumberToString(response_code.value())
+ : "<no value>"});
}
base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
base::BindOnce(upload_done_data.callback, success,
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc
index 98b5191..0900ab0b 100644
--- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc
+++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc
@@ -96,7 +96,7 @@
if ((DumpTypeContainsIncoming(type) && incoming_state_ != STATE_NONE) ||
(DumpTypeContainsOutgoing(type) && outgoing_state_ != STATE_NONE)) {
*error_message =
- "RTP dump already started for type " + base::IntToString(type);
+ "RTP dump already started for type " + base::NumberToString(type);
return false;
}
@@ -149,10 +149,9 @@
(DumpTypeContainsOutgoing(type) && outgoing_state_ != STATE_STARTED)) {
if (!callback.is_null()) {
FireGenericDoneCallback(
- callback,
- false,
+ callback, false,
"RTP dump not started or already stopped for type " +
- base::IntToString(type));
+ base::NumberToString(type));
}
return;
}
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
index f6d5c88..1eb2f7a 100644
--- a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
+++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
@@ -495,8 +495,8 @@
LogToCircularBuffer(
"Gpu: machine-model-name=" + gpu_info.machine_model_name +
", machine-model-version=" + gpu_info.machine_model_version +
- ", vendor-id=" + base::UintToString(active_gpu.vendor_id) +
- ", device-id=" + base::UintToString(active_gpu.device_id) +
+ ", vendor-id=" + base::NumberToString(active_gpu.vendor_id) +
+ ", device-id=" + base::NumberToString(active_gpu.device_id) +
", driver-vendor=" + active_gpu.driver_vendor +
", driver-version=" + active_gpu.driver_version);
LogToCircularBuffer("OpenGL: gl-vendor=" + gpu_info.gl_vendor +
diff --git a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
index d4e932c..3262cab 100644
--- a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
@@ -233,9 +233,9 @@
compare_command.AppendArg("--frame_analyzer");
compare_command.AppendArgPath(path_to_analyzer);
compare_command.AppendArg("--yuv_frame_width");
- compare_command.AppendArg(base::IntToString(width));
+ compare_command.AppendArg(base::NumberToString(width));
compare_command.AppendArg("--yuv_frame_height");
- compare_command.AppendArg(base::IntToString(height));
+ compare_command.AppendArg(base::NumberToString(height));
compare_command.AppendArg("--zxing_path");
compare_command.AppendArgPath(path_to_zxing);
compare_command.AppendArg("--ffmpeg_path");
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc
index aa6c1e1..e09b9da9 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -105,21 +105,21 @@
// a CHECK crash.
music_override_.reset();
std::string music_path_string("music");
- music_path_string.append(base::IntToString(times_overrides_changed_));
+ music_path_string.append(base::NumberToString(times_overrides_changed_));
music_override_.reset(new base::ScopedPathOverride(
chrome::DIR_USER_MUSIC,
fake_dir_.GetPath().AppendASCII(music_path_string)));
pictures_override_.reset();
std::string pictures_path_string("pictures");
- pictures_path_string.append(base::IntToString(times_overrides_changed_));
+ pictures_path_string.append(base::NumberToString(times_overrides_changed_));
pictures_override_.reset(new base::ScopedPathOverride(
chrome::DIR_USER_PICTURES,
fake_dir_.GetPath().AppendASCII(pictures_path_string)));
video_override_.reset();
std::string videos_path_string("videos");
- videos_path_string.append(base::IntToString(times_overrides_changed_));
+ videos_path_string.append(base::NumberToString(times_overrides_changed_));
video_override_.reset(new base::ScopedPathOverride(
chrome::DIR_USER_VIDEOS,
fake_dir_.GetPath().AppendASCII(videos_path_string)));
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
index c6d289f..c4a62565 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -81,7 +81,7 @@
int rate,
base::FieldTrial* trial) {
std::map<std::string, std::string> params = {
- {kRateParamName, base::IntToString(rate)}};
+ {kRateParamName, base::NumberToString(rate)}};
variations::AssociateVariationParams(trial->trial_name(), group_name, params);
trial->AppendGroup(group_name, rate);
}
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
index 8c2017a..49f2b5f 100644
--- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
+++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -45,7 +45,7 @@
base::PathService::Get(chrome::DIR_TEST_DATA, &script);
script = script.AppendASCII("nacl/debug_stub_browser_tests.py");
cmd.AppendArgPath(script);
- cmd.AppendArg(base::IntToString(debug_stub_port));
+ cmd.AppendArg(base::NumberToString(debug_stub_port));
cmd.AppendArg(test_name);
LOG(INFO) << cmd.GetCommandLineString();
*test_process = base::LaunchProcess(cmd, base::LaunchOptions());
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_unittest.cc b/chrome/browser/navigation_predictor/navigation_predictor_unittest.cc
index 55e591fb..98d2aaf 100644
--- a/chrome/browser/navigation_predictor/navigation_predictor_unittest.cc
+++ b/chrome/browser/navigation_predictor/navigation_predictor_unittest.cc
@@ -115,11 +115,11 @@
std::map<std::string, std::string> params;
if (preconnect_origin_score_threshold.has_value()) {
params["preconnect_origin_score_threshold"] =
- base::IntToString(preconnect_origin_score_threshold.value());
+ base::NumberToString(preconnect_origin_score_threshold.value());
}
if (prefetch_url_score_threshold.has_value()) {
params["prefetch_url_score_threshold"] =
- base::IntToString(prefetch_url_score_threshold.value());
+ base::NumberToString(prefetch_url_score_threshold.value());
}
scoped_feature_list.InitAndEnableFeatureWithParameters(
blink::features::kNavigationPredictor, params);
diff --git a/chrome/browser/notifications/notification_channels_provider_android_unittest.cc b/chrome/browser/notifications/notification_channels_provider_android_unittest.cc
index ddb5f10..96346df 100644
--- a/chrome/browser/notifications/notification_channels_provider_android_unittest.cc
+++ b/chrome/browser/notifications/notification_channels_provider_android_unittest.cc
@@ -70,7 +70,7 @@
const base::Time& timestamp,
bool enabled) override {
std::string channel_id =
- origin + base::Int64ToString(timestamp.ToInternalValue());
+ origin + base::NumberToString(timestamp.ToInternalValue());
// Note if a channel with this channel ID was already created, this is a
// no-op. This is intentional, to match the Android Channels API.
NotificationChannel channel =
diff --git a/chrome/browser/notifications/notification_platform_bridge_win.cc b/chrome/browser/notifications/notification_platform_bridge_win.cc
index dabed06..9fa1e8c2 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win.cc
@@ -679,7 +679,7 @@
bool incognito) {
std::string payload = base::StringPrintf(
"%s|%s|%d", notification_id.c_str(), profile_id.c_str(), incognito);
- return base::UintToString16(base::Hash(payload));
+ return base::NumberToString16(base::Hash(payload));
}
HRESULT OnDismissed(
diff --git a/chrome/browser/notifications/notification_platform_bridge_win_unittest.cc b/chrome/browser/notifications/notification_platform_bridge_win_unittest.cc
index 4c1acf3..2c58b6a 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win_unittest.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win_unittest.cc
@@ -128,7 +128,7 @@
ASSERT_HRESULT_SUCCEEDED(toast2->get_Tag(&hstring_tag));
base::win::ScopedHString tag(hstring_tag);
std::string tag_data = std::string(kNotificationId) + "|" + kProfileId + "|0";
- ASSERT_STREQ(base::UintToString16(base::Hash(tag_data)).c_str(),
+ ASSERT_STREQ(base::NumberToString16(base::Hash(tag_data)).c_str(),
tag.Get().as_string().c_str());
}
@@ -240,7 +240,7 @@
// Register a single notification with a specific tag.
std::string tag_data = std::string(kNotificationId) + "|" + kProfileId + "|0";
- base::string16 tag = base::UintToString16(base::Hash(tag_data));
+ base::string16 tag = base::NumberToString16(base::Hash(tag_data));
// Microsoft::WRL::Make() requires FakeIToastNotification to derive from
// RuntimeClass.
notifications.push_back(Microsoft::WRL::Make<FakeIToastNotification>(
diff --git a/chrome/browser/notifications/notification_ui_manager_browsertest.cc b/chrome/browser/notifications/notification_ui_manager_browsertest.cc
index 609a9bf..417d68da 100644
--- a/chrome/browser/notifications/notification_ui_manager_browsertest.cc
+++ b/chrome/browser/notifications/notification_ui_manager_browsertest.cc
@@ -59,7 +59,7 @@
const base::Optional<base::string16>& reply) override {
if (button_index) {
log_ += "ButtonClick_";
- log_ += base::IntToString(*button_index) + "_";
+ log_ += base::NumberToString(*button_index) + "_";
} else {
log_ += "Click_";
}
diff --git a/chrome/browser/notifications/win/fake_notification_image_retainer.cc b/chrome/browser/notifications/win/fake_notification_image_retainer.cc
index dc21de3..a5913c9c 100644
--- a/chrome/browser/notifications/win/fake_notification_image_retainer.cc
+++ b/chrome/browser/notifications/win/fake_notification_image_retainer.cc
@@ -14,7 +14,7 @@
base::FilePath FakeNotificationImageRetainer::RegisterTemporaryImage(
const gfx::Image& image) {
base::string16 file = base::string16(L"c:\\temp\\img") +
- base::IntToString16(counter_++) +
+ base::NumberToString16(counter_++) +
base::string16(L".tmp");
return base::FilePath(file);
}
diff --git a/chrome/browser/ntp_snippets/download_suggestions_provider.cc b/chrome/browser/ntp_snippets/download_suggestions_provider.cc
index b764b796..70be668c 100644
--- a/chrome/browser/ntp_snippets/download_suggestions_provider.cc
+++ b/chrome/browser/ntp_snippets/download_suggestions_provider.cc
@@ -89,13 +89,13 @@
std::string GetOfflinePagePerCategoryID(int64_t raw_offline_page_id) {
// Raw ID is prefixed in order to avoid conflicts with asset downloads.
return std::string(1, kOfflinePageDownloadsPrefix) +
- base::IntToString(raw_offline_page_id);
+ base::NumberToString(raw_offline_page_id);
}
std::string GetAssetDownloadPerCategoryID(uint32_t raw_download_id) {
// Raw ID is prefixed in order to avoid conflicts with offline page downloads.
return std::string(1, kAssetDownloadsPrefix) +
- base::UintToString(raw_download_id);
+ base::NumberToString(raw_download_id);
}
// Determines whether |suggestion_id| corresponds to offline page suggestion or
diff --git a/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc b/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
index 7010dc1..ecb70be4 100644
--- a/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
+++ b/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
@@ -160,7 +160,7 @@
std::unique_ptr<FakeDownloadItem> CreateDummyAssetDownload(int id) {
std::unique_ptr<FakeDownloadItem> item = std::make_unique<FakeDownloadItem>();
item->SetId(id);
- std::string id_string = base::IntToString(id);
+ std::string id_string = base::NumberToString(id);
item->SetGuid("XYZ-100032-EFZBDF-13323-PXZ" + id_string);
item->SetTargetFilePath(
base::FilePath::FromUTF8Unsafe("folder/file" + id_string + ".mhtml"));
@@ -344,7 +344,7 @@
ContentSuggestion::ID GetDummySuggestionId(int id, bool is_offline_page) {
return ContentSuggestion::ID(
downloads_category(),
- (is_offline_page ? "O" : "D") + base::IntToString(id));
+ (is_offline_page ? "O" : "D") + base::NumberToString(id));
}
std::vector<ContentSuggestion> GetDismissedSuggestions() {
diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrome/browser/offline_pages/android/offline_page_bridge.cc
index 59ae997b..196ae8e 100644
--- a/chrome/browser/offline_pages/android/offline_page_bridge.cc
+++ b/chrome/browser/offline_pages/android/offline_page_bridge.cc
@@ -207,7 +207,7 @@
break;
}
offline_header.need_to_persist = true;
- offline_header.id = base::Int64ToString(offline_id);
+ offline_header.id = base::NumberToString(offline_id);
RunLoadUrlParamsCallbackAndroid(j_callback_obj, launch_url, offline_header);
}
@@ -1043,7 +1043,7 @@
? offline_pages::OfflinePageHeader::Reason::FILE_URL_INTENT
: offline_pages::OfflinePageHeader::Reason::CONTENT_URL_INTENT;
offline_header.need_to_persist = true;
- offline_header.id = base::Int64ToString(offline_page->offline_id);
+ offline_header.id = base::NumberToString(offline_page->offline_id);
offline_header.intent_url = intent_url;
} else {
// If the offline page can't be found, launch the intent URL.
diff --git a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
index f279366..7a723c5 100644
--- a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
+++ b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
@@ -672,7 +672,7 @@
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
std::string file_name("test");
- file_name += base::IntToString(file_name_sequence_num_++);
+ file_name += base::NumberToString(file_name_sequence_num_++);
file_name += ".mht";
temp_file_path_ = temp_dir_.GetPath().AppendASCII(file_name);
ASSERT_NE(base::WriteFile(temp_file_path_, content.c_str(), content.length()),
@@ -877,7 +877,7 @@
DCHECK_NE(OfflinePageHeader::Reason::NONE, reason);
offline_page_header_.reason = reason;
if (offline_id)
- offline_page_header_.id = base::Int64ToString(offline_id);
+ offline_page_header_.id = base::NumberToString(offline_id);
return offline_page_header_.GetCompleteHeaderString();
}
@@ -888,7 +888,7 @@
DCHECK_NE(OfflinePageHeader::Reason::NONE, reason);
DCHECK(offline_id);
offline_page_header_.reason = reason;
- offline_page_header_.id = base::Int64ToString(offline_id);
+ offline_page_header_.id = base::NumberToString(offline_id);
offline_page_header_.intent_url = intent_url;
return offline_page_header_.GetCompleteHeaderString();
}
@@ -943,7 +943,7 @@
OfflinePageModel::SavePageParams save_page_params;
save_page_params.url = url;
save_page_params.client_id =
- ClientId(kDownloadNamespace, base::IntToString(item_counter));
+ ClientId(kDownloadNamespace, base::NumberToString(item_counter));
save_page_params.original_url = original_url;
OfflinePageModelFactory::GetForBrowserContext(profile())->SavePage(
save_page_params, std::move(archiver), nullptr,
diff --git a/chrome/browser/offline_pages/offline_page_utils.cc b/chrome/browser/offline_pages/offline_page_utils.cc
index c94db5e..db4141a 100644
--- a/chrome/browser/offline_pages/offline_page_utils.cc
+++ b/chrome/browser/offline_pages/offline_page_utils.cc
@@ -64,7 +64,7 @@
base::OnceCallback<void(const std::vector<OfflinePageItem>&)> callback,
const MultipleOfflinePageItemResult& pages) {
std::vector<OfflinePageItem> selected_pages;
- std::string tab_id_str = base::IntToString(tab_id);
+ std::string tab_id_str = base::NumberToString(tab_id);
// Exclude pages whose tab id does not match.
// Note: For this restriction to work offline pages saved to tab-bound
diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/offline_pages/recent_tab_helper.cc
index 38e60df..19a8127 100644
--- a/chrome/browser/offline_pages/recent_tab_helper.cc
+++ b/chrome/browser/offline_pages/recent_tab_helper.cc
@@ -175,7 +175,7 @@
tab_id_.clear();
if (delegate_->GetTabId(web_contents(), &tab_id_number))
- tab_id_ = base::IntToString(tab_id_number);
+ tab_id_ = base::NumberToString(tab_id_number);
// TODO(dimich): When we have BackgroundOffliner, avoid capturing prerenderer
// WebContents with its origin as well.
diff --git a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
index 42d10c0..00cb8fbd 100644
--- a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
+++ b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
@@ -288,7 +288,7 @@
ClientId RecentTabHelperTest::NewDownloadClientId() {
static int counter = 0;
return ClientId(kDownloadNamespace,
- std::string("id") + base::IntToString(++counter));
+ std::string("id") + base::NumberToString(++counter));
}
// Checks the test setup.
diff --git a/chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc
index 6efc217..59c49b89 100644
--- a/chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc
@@ -259,8 +259,8 @@
base::test::ScopedFeatureList scoped_feature_list;
std::map<std::string, std::string> parameters = {
- {"NoScriptInflationPercent", base::IntToString(inflation)},
- {"NoScriptInflationBytes", base::IntToString(constant_savings)}};
+ {"NoScriptInflationPercent", base::NumberToString(inflation)},
+ {"NoScriptInflationBytes", base::NumberToString(constant_savings)}};
scoped_feature_list.InitAndEnableFeatureWithParameters(
previews::features::kNoScriptPreviews, parameters);
@@ -297,9 +297,9 @@
base::test::ScopedFeatureList scoped_feature_list;
std::map<std::string, std::string> parameters = {
- {"ResourceLoadingHintsInflationPercent", base::IntToString(inflation)},
+ {"ResourceLoadingHintsInflationPercent", base::NumberToString(inflation)},
{"ResourceLoadingHintsInflationBytes",
- base::IntToString(constant_savings)}};
+ base::NumberToString(constant_savings)}};
scoped_feature_list.InitAndEnableFeatureWithParameters(
previews::features::kResourceLoadingHints, parameters);
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc
index 0fe1c175..617ccf09c 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x.cc
@@ -312,12 +312,12 @@
"submit_element", UTF16ToUTF8(form.submit_element).c_str(),
"signon_realm", form.signon_realm.c_str(),
"preferred", form.preferred,
- "date_created", base::Int64ToString(date_created).c_str(),
+ "date_created", base::NumberToString(date_created).c_str(),
"blacklisted_by_user", form.blacklisted_by_user,
"type", form.type,
"times_used", form.times_used,
"scheme", form.scheme,
- "date_synced", base::Int64ToString(date_synced).c_str(),
+ "date_synced", base::NumberToString(date_synced).c_str(),
"display_name", UTF16ToUTF8(form.display_name).c_str(),
"avatar_url", form.icon_url.spec().c_str(),
// We serialize unique origins as "", in order to make other systems that
diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
index eb82b7e..1d8786aba 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
@@ -462,8 +462,9 @@
CheckUint32Attribute(item, "type", form.type);
CheckUint32Attribute(item, "times_used", form.times_used);
CheckUint32Attribute(item, "scheme", form.scheme);
- CheckStringAttribute(item, "date_synced", base::Int64ToString(
- form.date_synced.ToInternalValue()));
+ CheckStringAttribute(
+ item, "date_synced",
+ base::NumberToString(form.date_synced.ToInternalValue()));
CheckStringAttribute(item, "display_name", UTF16ToUTF8(form.display_name));
CheckStringAttribute(item, "avatar_url", form.icon_url.spec());
// We serialize unique origins as "", in order to make other systems that
diff --git a/chrome/browser/password_manager/native_backend_libsecret.cc b/chrome/browser/password_manager/native_backend_libsecret.cc
index 3426c52e..789ecec 100644
--- a/chrome/browser/password_manager/native_backend_libsecret.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret.cc
@@ -342,12 +342,12 @@
"submit_element", UTF16ToUTF8(form.submit_element).c_str(),
"signon_realm", form.signon_realm.c_str(),
"preferred", form.preferred,
- "date_created", base::Int64ToString(date_created).c_str(),
+ "date_created", base::NumberToString(date_created).c_str(),
"blacklisted_by_user", form.blacklisted_by_user,
"type", form.type,
"times_used", form.times_used,
"scheme", form.scheme,
- "date_synced", base::Int64ToString(date_synced).c_str(),
+ "date_synced", base::NumberToString(date_synced).c_str(),
"display_name", UTF16ToUTF8(form.display_name).c_str(),
"avatar_url", form.icon_url.spec().c_str(),
// We serialize unique origins as "", in order to make other systems that
diff --git a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
index 9fd1a80..9651a533 100644
--- a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
@@ -415,7 +415,7 @@
CheckUint32Attribute(item, "scheme", form.scheme);
CheckStringAttribute(
item, "date_synced",
- base::Int64ToString(form.date_synced.ToInternalValue()));
+ base::NumberToString(form.date_synced.ToInternalValue()));
CheckStringAttribute(item, "display_name", UTF16ToUTF8(form.display_name));
CheckStringAttribute(item, "avatar_url", form.icon_url.spec());
// We serialize unique origins as "", in order to make other systems that
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 56e99a0f..f7c7645 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -311,7 +311,8 @@
void ConvertPageCoordToScreenCoord(WebContents* contents, gfx::Point* point) {
ASSERT_TRUE(contents);
- ASSERT_TRUE(content::ExecuteScript(contents,
+ ASSERT_TRUE(content::ExecuteScript(
+ contents,
"var visiblePage = viewer.viewport.getMostVisiblePage();"
"var visiblePageDimensions ="
" viewer.viewport.getPageScreenRect(visiblePage);"
@@ -319,10 +320,14 @@
"var screenOffsetX = visiblePageDimensions.x - viewportPosition.x;"
"var screenOffsetY = visiblePageDimensions.y - viewportPosition.y;"
"var linkScreenPositionX ="
- " Math.floor(" + base::IntToString(point->x()) + " + screenOffsetX);"
- "var linkScreenPositionY ="
- " Math.floor(" + base::IntToString(point->y()) + " +"
- " screenOffsetY);"));
+ " Math.floor(" +
+ base::NumberToString(point->x()) +
+ " + screenOffsetX);"
+ "var linkScreenPositionY ="
+ " Math.floor(" +
+ base::NumberToString(point->y()) +
+ " +"
+ " screenOffsetY);"));
int x;
ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
diff --git a/chrome/browser/policy/developer_tools_policy_handler.cc b/chrome/browser/policy/developer_tools_policy_handler.cc
index d32c6f90..8559ca9 100644
--- a/chrome/browser/policy/developer_tools_policy_handler.cc
+++ b/chrome/browser/policy/developer_tools_policy_handler.cc
@@ -95,7 +95,8 @@
if (!IsValidDeveloperToolsAvailabilityValue(value)) {
if (errors) {
errors->AddError(key::kDeveloperToolsAvailability,
- IDS_POLICY_OUT_OF_RANGE_ERROR, base::IntToString(value));
+ IDS_POLICY_OUT_OF_RANGE_ERROR,
+ base::NumberToString(value));
}
return PolicyCheckResult::kInvalid;
}
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 8d1ccf3..b41c53f68 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -1203,11 +1203,11 @@
security_interstitials::SecurityInterstitialTabHelper::
FromWebContents(tab);
helper->GetBlockingPageForCurrentlyCommittedNavigationForTesting()
- ->CommandReceived(base::IntToString(command));
+ ->CommandReceived(base::NumberToString(command));
return;
}
tab->GetInterstitialPage()->GetDelegateForTesting()->CommandReceived(
- base::IntToString(command));
+ base::NumberToString(command));
}
private:
diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
index 8e45024..f65b170 100644
--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
@@ -372,7 +372,8 @@
num_tracked_prefs_ += num_split_tracked_prefs;
- std::string num_tracked_prefs_str = base::IntToString(num_tracked_prefs_);
+ std::string num_tracked_prefs_str =
+ base::NumberToString(num_tracked_prefs_);
EXPECT_EQ(static_cast<int>(num_tracked_prefs_str.size()),
base::WriteFile(num_tracked_prefs_file,
num_tracked_prefs_str.c_str(),
diff --git a/chrome/browser/prerender/prerender_history.cc b/chrome/browser/prerender/prerender_history.cc
index fef80168..1bb6597 100644
--- a/chrome/browser/prerender/prerender_history.cc
+++ b/chrome/browser/prerender/prerender_history.cc
@@ -48,7 +48,7 @@
// integers.
entry_dict->SetString(
"end_time",
- base::Int64ToString((entry.end_time - epoch_start).InMilliseconds()));
+ base::NumberToString((entry.end_time - epoch_start).InMilliseconds()));
return_list->Append(std::move(entry_dict));
}
return std::move(return_list);
diff --git a/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc
index 62300436..1b38521 100644
--- a/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc
+++ b/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc
@@ -425,7 +425,7 @@
GURL second_script_url(std::string("http://foo.bar") + kPrefetchScript2);
GURL prefetch_response_header_csp = GetURLWithReplacement(
kPrefetchResponseHeaderCSP, "REPLACE_WITH_PORT",
- base::IntToString(src_server()->host_port_pair().port()));
+ base::NumberToString(src_server()->host_port_pair().port()));
PrefetchFromURL(prefetch_response_header_csp,
FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
@@ -444,7 +444,7 @@
GURL second_script_url(std::string("http://foo.bar") + kPrefetchScript2);
GURL prefetch_meta_tag_csp = GetURLWithReplacement(
kPrefetchMetaCSP, "REPLACE_WITH_PORT",
- base::IntToString(src_server()->host_port_pair().port()));
+ base::NumberToString(src_server()->host_port_pair().port()));
PrefetchFromURL(prefetch_meta_tag_csp,
FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
diff --git a/chrome/browser/previews/previews_infobar_delegate_unittest.cc b/chrome/browser/previews/previews_infobar_delegate_unittest.cc
index 78e80d9..925cdb7 100644
--- a/chrome/browser/previews/previews_infobar_delegate_unittest.cc
+++ b/chrome/browser/previews/previews_infobar_delegate_unittest.cc
@@ -585,7 +585,7 @@
TestStalePreviews(
staleness_in_minutes, false /* is_reload */,
l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES,
- base::IntToString16(staleness_in_minutes)),
+ base::NumberToString16(staleness_in_minutes)),
PreviewsUITabHelper::PreviewsStalePreviewTimestamp::kTimestampShown);
}
@@ -612,7 +612,7 @@
TestStalePreviews(
staleness_in_hours * 60, false /* is_reload */,
l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_HOURS,
- base::IntToString16(staleness_in_hours)),
+ base::NumberToString16(staleness_in_hours)),
PreviewsUITabHelper::PreviewsStalePreviewTimestamp::kTimestampShown);
}
@@ -626,7 +626,7 @@
TestStalePreviews(
2, false /* is_reload */,
l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES,
- base::IntToString16(2)),
+ base::NumberToString16(2)),
PreviewsUITabHelper::PreviewsStalePreviewTimestamp::kTimestampShown);
TestStalePreviews(6, false /* is_reload */, base::string16(),
@@ -661,7 +661,7 @@
TestStalePreviews(
staleness_in_minutes, false /* is_reload */,
l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES,
- base::IntToString16(staleness_in_minutes)),
+ base::NumberToString16(staleness_in_minutes)),
PreviewsUITabHelper::PreviewsStalePreviewTimestamp::kTimestampShown);
staleness_in_minutes = 1;
diff --git a/chrome/browser/previews/previews_lite_page_browsertest.cc b/chrome/browser/previews/previews_lite_page_browsertest.cc
index 22b4e396..f180d92 100644
--- a/chrome/browser/previews/previews_lite_page_browsertest.cc
+++ b/chrome/browser/previews/previews_lite_page_browsertest.cc
@@ -205,7 +205,7 @@
{"blacklisted_path_suffixes", ".mp4,.jpg"},
{"trigger_on_localhost", "true"},
{"navigation_timeout_milliseconds",
- use_timeout ? base::IntToString(kTimeoutMs) : "0"},
+ use_timeout ? base::NumberToString(kTimeoutMs) : "0"},
{"control_group", is_control ? "true" : "false"}};
scoped_parameterized_feature_list_.InitAndEnableFeatureWithParameters(
@@ -420,9 +420,9 @@
GURL HttpLitePageURL(PreviewsServerAction action,
std::string* headers = nullptr,
int delay_ms = 0) const {
- std::string query = "resp=" + base::IntToString(action);
+ std::string query = "resp=" + base::NumberToString(action);
if (delay_ms != 0)
- query += "&delay_ms=" + base::IntToString(delay_ms);
+ query += "&delay_ms=" + base::NumberToString(delay_ms);
if (headers)
query += "&headers=" + *headers;
GURL::Replacements replacements;
@@ -437,9 +437,9 @@
GURL HttpsLitePageURL(PreviewsServerAction action,
std::string* headers = nullptr,
int delay_ms = 0) const {
- std::string query = "resp=" + base::IntToString(action);
+ std::string query = "resp=" + base::NumberToString(action);
if (delay_ms != 0)
- query += "&delay_ms=" + base::IntToString(delay_ms);
+ query += "&delay_ms=" + base::NumberToString(delay_ms);
if (headers)
query += "&headers=" + *headers;
GURL::Replacements replacements;
@@ -580,7 +580,7 @@
GURL subresource_url(
"https://foo.litepages.googlezip.net:" +
- base::IntToString(previews_server().EffectiveIntPort()) +
+ base::NumberToString(previews_server().EffectiveIntPort()) +
"/subresource.png");
std::string subresource_body = "<html><body><img src=\"" +
subresource_url.spec() +
diff --git a/chrome/browser/previews/previews_lite_page_decider_unittest.cc b/chrome/browser/previews/previews_lite_page_decider_unittest.cc
index 0bde54a..e34c91de 100644
--- a/chrome/browser/previews/previews_lite_page_decider_unittest.cc
+++ b/chrome/browser/previews/previews_lite_page_decider_unittest.cc
@@ -64,7 +64,7 @@
manager->BlacklistBypassedHost(kHost, kOneDay);
EXPECT_TRUE(manager->HostBlacklistedFromBypass(kHost));
for (int i = 1; i <= kBlacklistDurationDays; i++) {
- manager->BlacklistBypassedHost(kHost + base::IntToString(i),
+ manager->BlacklistBypassedHost(kHost + base::NumberToString(i),
kOneDay + base::TimeDelta::FromSeconds(i));
}
EXPECT_FALSE(manager->HostBlacklistedFromBypass(kHost));
@@ -74,7 +74,7 @@
manager->BlacklistBypassedHost(kHost, kOneDay);
EXPECT_TRUE(manager->HostBlacklistedFromBypass(kHost));
for (int i = 1; i <= kBlacklistDurationDays - 1; i++) {
- manager->BlacklistBypassedHost(kHost + base::IntToString(i),
+ manager->BlacklistBypassedHost(kHost + base::NumberToString(i),
kOneDay + base::TimeDelta::FromSeconds(i));
}
manager->BlacklistBypassedHost(kOtherHost, kYesterday);
diff --git a/chrome/browser/previews/previews_lite_page_navigation_throttle.cc b/chrome/browser/previews/previews_lite_page_navigation_throttle.cc
index 5beb187..e970572e 100644
--- a/chrome/browser/previews/previews_lite_page_navigation_throttle.cc
+++ b/chrome/browser/previews/previews_lite_page_navigation_throttle.cc
@@ -406,7 +406,7 @@
std::string origin_hash = base::ToLowerASCII(base32::Base32Encode(
crypto::SHA256HashString(
original_url.scheme() + "://" + original_url.host() + ":" +
- base::IntToString(original_url.EffectiveIntPort())),
+ base::NumberToString(original_url.EffectiveIntPort())),
base32::Base32EncodePolicy::OMIT_PADDING));
GURL previews_host = previews::params::GetLitePagePreviewsDomainURL();
GURL previews_url = GURL(
diff --git a/chrome/browser/previews/previews_ui_tab_helper.cc b/chrome/browser/previews/previews_ui_tab_helper.cc
index a1a0f9b..49bbee5 100644
--- a/chrome/browser/previews/previews_ui_tab_helper.cc
+++ b/chrome/browser/previews/previews_ui_tab_helper.cc
@@ -210,13 +210,13 @@
DCHECK_GE(staleness_in_minutes, 2);
return l10n_util::GetStringFUTF16(
IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES,
- base::IntToString16(staleness_in_minutes));
+ base::NumberToString16(staleness_in_minutes));
} else if (staleness_in_minutes < 120) {
return l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_ONE_HOUR);
} else {
return l10n_util::GetStringFUTF16(
IDS_PREVIEWS_INFOBAR_TIMESTAMP_HOURS,
- base::IntToString16(staleness_in_minutes / 60));
+ base::NumberToString16(staleness_in_minutes / 60));
}
}
diff --git a/chrome/browser/printing/cloud_print/privet_http_impl.cc b/chrome/browser/printing/cloud_print/privet_http_impl.cc
index 57cb9dc4..0114bbf9 100644
--- a/chrome/browser/printing/cloud_print/privet_http_impl.cc
+++ b/chrome/browser/printing/cloud_print/privet_http_impl.cc
@@ -703,7 +703,7 @@
GURL::Replacements replacements;
std::string host = host_port_.HostForURL();
replacements.SetHostStr(host);
- std::string port = base::UintToString(host_port_.port());
+ std::string port = base::NumberToString(host_port_.port());
replacements.SetPortStr(port);
net::NetworkTrafficAnnotationTag traffic_annotation =
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index 5ae6482..349cb00 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -317,8 +317,7 @@
const std::string& hostname,
int pid) {
base::string16 error = l10n_util::GetStringFUTF16(
- IDS_PROFILE_IN_USE_POSIX,
- base::IntToString16(pid),
+ IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
base::ASCIIToUTF16(hostname));
LOG(ERROR) << error;
diff --git a/chrome/browser/profiles/incognito_mode_policy_handler.cc b/chrome/browser/profiles/incognito_mode_policy_handler.cc
index d95db82..7fa2b3f 100644
--- a/chrome/browser/profiles/incognito_mode_policy_handler.cc
+++ b/chrome/browser/profiles/incognito_mode_policy_handler.cc
@@ -37,7 +37,7 @@
&availability_enum_value)) {
errors->AddError(key::kIncognitoModeAvailability,
IDS_POLICY_OUT_OF_RANGE_ERROR,
- base::IntToString(int_value));
+ base::NumberToString(int_value));
return false;
}
return true;
diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc
index d22716cb..44b3964 100644
--- a/chrome/browser/profiles/profile_attributes_storage.cc
+++ b/chrome/browser/profiles/profile_attributes_storage.cc
@@ -213,7 +213,7 @@
// it uses sscanf.
// TODO(jshin): fix IsDefaultProfileName to handle native digits.
name = l10n_util::GetStringFUTF16(IDS_NEW_NUMBERED_PROFILE_NAME,
- base::IntToString16(name_index));
+ base::NumberToString16(name_index));
#else
if (icon_index < profiles::GetGenericAvatarIconCount()) {
name = l10n_util::GetStringFUTF16Int(IDS_NUMBERED_PROFILE_NAME,
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index be3d8ff4..5dda405 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -793,7 +793,7 @@
// Create the next profile in the next available directory slot.
int next_directory = local_state->GetInteger(prefs::kProfilesNumCreated);
std::string profile_name = chrome::kMultiProfileDirPrefix;
- profile_name.append(base::IntToString(next_directory));
+ profile_name.append(base::NumberToString(next_directory));
base::FilePath new_path = user_data_dir_;
#if defined(OS_WIN)
new_path = new_path.Append(base::ASCIIToUTF16(profile_name));
diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.cc b/chrome/browser/push_messaging/push_messaging_app_identifier.cc
index 94f3428..8a3fae2 100644
--- a/chrome/browser/push_messaging/push_messaging_app_identifier.cc
+++ b/chrome/browser/push_messaging/push_messaging_app_identifier.cc
@@ -33,7 +33,7 @@
std::string MakePrefValue(const GURL& origin,
int64_t service_worker_registration_id) {
return origin.spec() + kSeparator +
- base::Int64ToString(service_worker_registration_id);
+ base::NumberToString(service_worker_registration_id);
}
bool GetOriginAndSWRFromPrefValue(const std::string& pref_value,
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
index f547948..59e295a 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
@@ -103,7 +103,7 @@
cleaner_command_line_.AppendSwitchASCII(chrome_cleaner::kChromeVersionSwitch,
version_info::GetVersionNumber());
cleaner_command_line_.AppendSwitchASCII(chrome_cleaner::kChromeChannelSwitch,
- base::IntToString(ChannelAsInt()));
+ base::NumberToString(ChannelAsInt()));
base::FilePath chrome_exe_path;
base::PathService::Get(base::FILE_EXE, &chrome_exe_path);
cleaner_command_line_.AppendSwitchPath(chrome_cleaner::kChromeExePathSwitch,
@@ -115,7 +115,7 @@
// Start the cleaner process in scanning mode.
cleaner_command_line_.AppendSwitchASCII(
chrome_cleaner::kExecutionModeSwitch,
- base::IntToString(
+ base::NumberToString(
static_cast<int>(chrome_cleaner::ExecutionMode::kScanning)));
// If set, forward the engine flag from the reporter. Otherwise, set the
@@ -134,7 +134,8 @@
cleaner_command_line_.AppendSwitchASCII(
chrome_cleaner::kChromePromptSwitch,
- base::IntToString(static_cast<int>(reporter_invocation.chrome_prompt())));
+ base::NumberToString(
+ static_cast<int>(reporter_invocation.chrome_prompt())));
// If metrics is enabled, we can enable crash reporting in the Chrome Cleaner
// process.
@@ -150,7 +151,7 @@
chrome_cleaner::kSRTPromptFieldTrialGroupNameSwitch, group_name);
}
- std::string reboot_prompt_type = base::IntToString(GetRebootPromptType());
+ std::string reboot_prompt_type = base::NumberToString(GetRebootPromptType());
cleaner_command_line_.AppendSwitchASCII(
chrome_cleaner::kRebootPromptMethodSwitch, reboot_prompt_type);
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc
index a543024..a7ab2ec 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc
@@ -189,7 +189,7 @@
EXPECT_EQ(
command_line_.GetSwitchValueASCII(chrome_cleaner::kExecutionModeSwitch),
- base::IntToString(
+ base::NumberToString(
static_cast<int>(chrome_cleaner::ExecutionMode::kScanning)));
// Ensure that the engine flag is always set and that it correctly reflects
@@ -215,7 +215,7 @@
command_line_.HasSwitch(chrome_cleaner::kWithScanningModeLogsSwitch));
EXPECT_EQ(
command_line_.GetSwitchValueASCII(chrome_cleaner::kChromePromptSwitch),
- base::IntToString(static_cast<int>(chrome_prompt_)));
+ base::NumberToString(static_cast<int>(chrome_prompt_)));
const std::string reboot_prompt_method = command_line_.GetSwitchValueASCII(
chrome_cleaner::kRebootPromptMethodSwitch);
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
index 95eb0e9e..5d194f4 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
@@ -202,20 +202,21 @@
if (crash_point() != CrashPoint::kNone) {
command_line->AppendSwitchASCII(
- kCrashPointSwitch, base::IntToString(static_cast<int>(crash_point())));
+ kCrashPointSwitch,
+ base::NumberToString(static_cast<int>(crash_point())));
}
command_line->AppendSwitchASCII(
kRegistryKeysReportingSwitch,
- base::IntToString(static_cast<int>(registry_keys_reporting())));
+ base::NumberToString(static_cast<int>(registry_keys_reporting())));
command_line->AppendSwitchASCII(
kExtensionsReportingSwitch,
- base::IntToString(static_cast<int>(extensions_reporting())));
+ base::NumberToString(static_cast<int>(extensions_reporting())));
if (expected_user_response() != PromptAcceptance::UNSPECIFIED) {
command_line->AppendSwitchASCII(
kExpectedUserResponseSwitch,
- base::IntToString(static_cast<int>(expected_user_response())));
+ base::NumberToString(static_cast<int>(expected_user_response())));
}
}
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
index d81a5e8..4847e79 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
@@ -958,7 +958,7 @@
chrome_cleaner::kChromeVersionSwitch, version_info::GetVersionNumber());
invocation->mutable_command_line().AppendSwitchNative(
chrome_cleaner::kChromeChannelSwitch,
- base::IntToString16(ChannelAsInt()));
+ base::NumberToString16(ChannelAsInt()));
}
void SendResultAndDeleteSelf(SwReporterInvocationResult result) {
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
index 103f74f..0e174a6 100644
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
@@ -431,7 +431,7 @@
update->SetKey(
Origin::Create(web_contents->GetLastCommittedURL()).Serialize(),
base::Value(
- base::Int64ToString(GetLastCommittedNavigationID(web_contents))));
+ base::NumberToString(GetLastCommittedNavigationID(web_contents))));
}
UpdateSecurityState(SB_THREAT_TYPE_SIGN_IN_PASSWORD_REUSE,
diff --git a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc b/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
index 1319e4fb..982e83e 100644
--- a/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_model_loader_unittest.cc
@@ -83,7 +83,7 @@
std::map<std::string, std::string> params;
params[ModelLoader::kClientModelFinchParam] =
- base::IntToString(model_number);
+ base::NumberToString(model_number);
ASSERT_TRUE(variations::AssociateVariationParams(
ModelLoader::kClientModelFinchExperiment, group_name, params));
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc
index 0e30cfc..b5addb3 100644
--- a/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc
@@ -133,8 +133,8 @@
void TearDown() override { DownloadFeedback::RegisterFactory(nullptr); }
base::FilePath CreateTestFile(int n) const {
- base::FilePath upload_file_path(
- temp_dir_.GetPath().AppendASCII("test file " + base::IntToString(n)));
+ base::FilePath upload_file_path(temp_dir_.GetPath().AppendASCII(
+ "test file " + base::NumberToString(n)));
const std::string upload_file_data = "data";
int wrote = base::WriteFile(upload_file_path, upload_file_data.data(),
upload_file_data.size());
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
index 36d68cc0..fc87da9 100644
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -289,7 +289,7 @@
learn_more_url, g_browser_process->GetApplicationLocale());
learn_more_url = net::AppendQueryParameter(
learn_more_url, "ctx",
- base::IntToString(static_cast<int>(item.GetDangerType())));
+ base::NumberToString(static_cast<int>(item.GetDangerType())));
navigator->OpenURL(
content::OpenURLParams(learn_more_url, content::Referrer(),
WindowOpenDisposition::NEW_FOREGROUND_TAB,
diff --git a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
index 276f8e1..2fae08c6 100644
--- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
@@ -100,7 +100,7 @@
extension_prefs_->UpdateExtensionPref(
extension_id, "install_time",
std::make_unique<base::Value>(
- base::Int64ToString(install_time.ToInternalValue())));
+ base::NumberToString(install_time.ToInternalValue())));
extension_prefs_->UpdateExtensionPref(
extension_id, "state", std::make_unique<base::Value>(state_value));
}
@@ -153,7 +153,7 @@
std::unique_ptr<ExtensionTestingProfile> CreateProfile(
SafeBrowsingDisposition safe_browsing_opt_in) {
std::string profile_name("profile");
- profile_name.append(base::IntToString(++profile_number_));
+ profile_name.append(base::NumberToString(++profile_number_));
// Create prefs for the profile and safe browsing preferences accordingly.
std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> prefs(
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
index 424cf3f..c5a7a2c1 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
@@ -1299,10 +1299,10 @@
// Test that a profile's prune state is properly cleaned upon load.
TEST_F(IncidentReportingServiceTest, CleanLegacyPruneState) {
CreateIncidentReportingService();
- const std::string blacklist_load_type(base::IntToString(static_cast<int32_t>(
- safe_browsing::IncidentType::OBSOLETE_BLACKLIST_LOAD)));
- const std::string preference_type(base::IntToString(
- static_cast<int32_t>(safe_browsing::IncidentType::TRACKED_PREFERENCE)));
+ const std::string blacklist_load_type(base::NumberToString(
+ static_cast<int>(safe_browsing::IncidentType::OBSOLETE_BLACKLIST_LOAD)));
+ const std::string preference_type(base::NumberToString(
+ static_cast<int>(safe_browsing::IncidentType::TRACKED_PREFERENCE)));
// Set up a prune state dict with data to be cleared (and not).
std::unique_ptr<base::DictionaryValue> incidents_sent(
diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
index 1361ac6..5cce36da 100644
--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
@@ -166,7 +166,7 @@
TestingProfile* CreateProfile(SafeBrowsingDisposition safe_browsing_opt_in) {
std::string profile_name("profile");
- profile_name.append(base::IntToString(++profile_number_));
+ profile_name.append(base::NumberToString(++profile_number_));
// Set up keyed service factories.
TestingProfile::TestingFactories factories;
diff --git a/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc b/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc
index a5469cf..538a473 100644
--- a/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc
@@ -96,7 +96,7 @@
if (!key_digest.has_key() || !key_digest.has_digest())
continue;
type_dict->SetKey(key_digest.key(),
- base::Value(base::UintToString(key_digest.digest())));
+ base::Value(base::NumberToString(key_digest.digest())));
}
}
@@ -110,7 +110,7 @@
type_incidents.incidents().key_to_digest_size() == 0) {
continue;
}
- std::string type_string(base::IntToString(type_incidents.type()));
+ std::string type_string(base::NumberToString(type_incidents.type()));
base::Value* type_dict =
value_dict->FindKeyOfType(type_string, base::Value::Type::DICTIONARY);
if (!type_dict) {
diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store.cc b/chrome/browser/safe_browsing/incident_reporting/state_store.cc
index c86469a..32c0a5f6 100644
--- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc
@@ -37,7 +37,7 @@
void StateStore::Transaction::MarkAsReported(IncidentType type,
const std::string& key,
IncidentDigest digest) {
- std::string type_string(base::IntToString(static_cast<int32_t>(type)));
+ std::string type_string(base::NumberToString(static_cast<int>(type)));
base::DictionaryValue* incidents_sent = GetPrefDict();
base::Value* type_dict =
incidents_sent->FindKeyOfType(type_string, base::Value::Type::DICTIONARY);
@@ -45,7 +45,7 @@
type_dict = incidents_sent->SetKey(
type_string, base::Value(base::Value::Type::DICTIONARY));
}
- type_dict->SetKey(key, base::Value(base::UintToString(digest)));
+ type_dict->SetKey(key, base::Value(base::NumberToString(digest)));
}
void StateStore::Transaction::Clear(IncidentType type, const std::string& key) {
@@ -57,7 +57,7 @@
// to remove before committing to making a change since any use of GetPrefDict
// will result in a full serialize-and-write operation on the preferences
// store.
- std::string type_string(base::IntToString(static_cast<int32_t>(type)));
+ std::string type_string(base::NumberToString(static_cast<int>(type)));
const base::DictionaryValue* const_type_dict = nullptr;
if (store_->incidents_sent_->GetDictionaryWithoutPathExpansion(
type_string, &const_type_dict) &&
@@ -77,7 +77,7 @@
// to remove before committing to making a change since any use of GetPrefDict
// will result in a full serialize-and-write operation on the preferences
// store.
- std::string type_string(base::IntToString(static_cast<int32_t>(type)));
+ std::string type_string(base::NumberToString(static_cast<int>(type)));
const base::DictionaryValue* type_dict = nullptr;
if (store_->incidents_sent_->GetDictionaryWithoutPathExpansion(type_string,
&type_dict)) {
@@ -160,9 +160,9 @@
std::string digest_string;
return (incidents_sent_ &&
incidents_sent_->GetDictionaryWithoutPathExpansion(
- base::IntToString(static_cast<int32_t>(type)), &type_dict) &&
+ base::NumberToString(static_cast<int>(type)), &type_dict) &&
type_dict->GetStringWithoutPathExpansion(key, &digest_string) &&
- digest_string == base::UintToString(digest));
+ digest_string == base::NumberToString(digest));
}
void StateStore::CleanLegacyValues(Transaction* transaction) {
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 798e575..db94cfb 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -492,7 +492,7 @@
}
EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
ssl_blocking_page->GetTypeForTesting());
- ssl_blocking_page->CommandReceived(base::IntToString(
+ ssl_blocking_page->CommandReceived(base::NumberToString(
security_interstitials::SecurityInterstitialCommand::CMD_PROCEED));
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials))
EXPECT_TRUE(WaitForRenderFrameReady(contents->GetMainFrame()));
@@ -558,7 +558,7 @@
ASSERT_TRUE(interstitial_page);
ASSERT_EQ(SafeBrowsingBlockingPage::kTypeForTesting,
interstitial_page->GetTypeForTesting());
- interstitial_page->CommandReceived(base::IntToString(command));
+ interstitial_page->CommandReceived(base::NumberToString(command));
}
void AssertNoInterstitial(bool wait_for_delete) {
diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
index f84d217..34816e350 100644
--- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc
+++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
@@ -92,7 +92,7 @@
EXPECT_EQ(prepopulate_urls.size(), all_urls.size());
- std::string port(base::IntToString(embedded_test_server()->port()));
+ std::string port(base::NumberToString(embedded_test_server()->port()));
ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
browser(), GURL("http://www.foo.com:" + port + "/"), 1);
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.cc b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
index 56a2fe3..28b03d7 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler.cc
@@ -71,9 +71,8 @@
// No error
break;
default:
- errors->AddError(policy_name(),
- IDS_POLICY_OUT_OF_RANGE_ERROR,
- base::IntToString(restore_value));
+ errors->AddError(policy_name(), IDS_POLICY_OUT_OF_RANGE_ERROR,
+ base::NumberToString(restore_value));
}
}
return true;
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
index 884a5e66..e7a7f7a 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc
@@ -82,7 +82,7 @@
ASSERT_EQ(1U, errors().size());
EXPECT_EQ(l10n_util::GetStringFUTF16(
IDS_POLICY_OUT_OF_RANGE_ERROR,
- base::ASCIIToUTF16(base::IntToString(impossible_value))),
+ base::ASCIIToUTF16(base::NumberToString(impossible_value))),
errors().begin()->second);
}
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index ac40565..17b823b2 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -53,7 +53,7 @@
void SetUp() override {
BrowserWithTestWindowTest::SetUp();
- std::string b = base::Int64ToString(base::Time::Now().ToInternalValue());
+ std::string b = base::NumberToString(base::Time::Now().ToInternalValue());
TestingProfile* profile = profile_manager()->CreateTestingProfile(b);
SessionService* session_service = new SessionService(profile);
path_ = profile->GetPath();
@@ -619,7 +619,7 @@
for (int i = 0; i < 5; ++i) {
SerializedNavigationEntry nav =
SerializedNavigationEntryTestHelper::CreateNavigation(
- base_url + base::IntToString(i), "a");
+ base_url + base::NumberToString(i), "a");
nav.set_index(i);
UpdateNavigation(window_id, tab_id, nav, (i == 3));
}
@@ -643,11 +643,11 @@
sessions::SessionTab* tab = windows[0]->tabs[0].get();
ASSERT_EQ(1, tab->current_navigation_index);
EXPECT_EQ(3U, tab->navigations.size());
- EXPECT_TRUE(GURL(base_url + base::IntToString(2)) ==
+ EXPECT_TRUE(GURL(base_url + base::NumberToString(2)) ==
tab->navigations[0].virtual_url());
- EXPECT_TRUE(GURL(base_url + base::IntToString(3)) ==
+ EXPECT_TRUE(GURL(base_url + base::NumberToString(3)) ==
tab->navigations[1].virtual_url());
- EXPECT_TRUE(GURL(base_url + base::IntToString(4)) ==
+ EXPECT_TRUE(GURL(base_url + base::NumberToString(4)) ==
tab->navigations[2].virtual_url());
}
@@ -662,7 +662,7 @@
for (int i = 0; i < 5; ++i) {
SerializedNavigationEntry nav =
SerializedNavigationEntryTestHelper::CreateNavigation(
- base_url + base::IntToString(i), "a");
+ base_url + base::NumberToString(i), "a");
nav.set_index(i);
UpdateNavigation(window_id, tab_id, nav, (i == 3));
}
@@ -859,7 +859,7 @@
for (int i = 0; i < 5; ++i) {
SerializedNavigationEntry nav =
SerializedNavigationEntryTestHelper::CreateNavigation(
- base_url + base::IntToString(i), "a");
+ base_url + base::NumberToString(i), "a");
nav.set_index(i / 2);
UpdateNavigation(window_id, tab_id, nav, true);
}
@@ -872,11 +872,11 @@
ASSERT_EQ(1U, windows.size());
ASSERT_EQ(1U, windows[0]->tabs.size());
EXPECT_EQ(3U, windows[0]->tabs[0]->navigations.size());
- EXPECT_EQ(GURL(base_url + base::IntToString(1)),
+ EXPECT_EQ(GURL(base_url + base::NumberToString(1)),
windows[0]->tabs[0]->navigations[0].virtual_url());
- EXPECT_EQ(GURL(base_url + base::IntToString(3)),
+ EXPECT_EQ(GURL(base_url + base::NumberToString(3)),
windows[0]->tabs[0]->navigations[1].virtual_url());
- EXPECT_EQ(GURL(base_url + base::IntToString(4)),
+ EXPECT_EQ(GURL(base_url + base::NumberToString(4)),
windows[0]->tabs[0]->navigations[2].virtual_url());
}
@@ -889,7 +889,7 @@
for (int i = 0; i < 5; ++i) {
SerializedNavigationEntry nav =
SerializedNavigationEntryTestHelper::CreateNavigation(
- base_url + base::IntToString(i), "a");
+ base_url + base::NumberToString(i), "a");
nav.set_index(i);
UpdateNavigation(window_id, tab_id, nav, true);
}
@@ -900,7 +900,7 @@
// Add another navigation to replace the last one.
SerializedNavigationEntry nav =
SerializedNavigationEntryTestHelper::CreateNavigation(
- base_url + base::IntToString(5), "a");
+ base_url + base::NumberToString(5), "a");
nav.set_index(4);
UpdateNavigation(window_id, tab_id, nav, true);
@@ -913,7 +913,7 @@
ASSERT_EQ(1U, windows.size());
ASSERT_EQ(1U, windows[0]->tabs.size());
ASSERT_EQ(1U, windows[0]->tabs[0]->navigations.size());
- EXPECT_EQ(GURL(base_url + base::IntToString(5)),
+ EXPECT_EQ(GURL(base_url + base::NumberToString(5)),
windows[0]->tabs[0]->navigations[0].virtual_url());
}
diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc
index d19f328..c157b168 100644
--- a/chrome/browser/shell_integration_win_unittest.cc
+++ b/chrome/browser/shell_integration_win_unittest.cc
@@ -84,7 +84,7 @@
base::win::ShortcutProperties* shortcut_properties) {
ShortcutTestObject shortcut_test_object;
base::FilePath shortcut_path = temp_dir_.GetPath().Append(
- L"Shortcut " + base::IntToString16(shortcuts_.size()) +
+ L"Shortcut " + base::NumberToString16(shortcuts_.size()) +
installer::kLnkExt);
shortcut_test_object.path = shortcut_path;
shortcut_test_object.properties = *shortcut_properties;
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
index 793859909..2fd3022e1 100644
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -150,7 +150,7 @@
url = net::AppendQueryParameter(
url, kSignInPromoQueryKeyAccessPoint,
- base::IntToString(static_cast<int>(access_point)));
+ base::NumberToString(static_cast<int>(access_point)));
// TODO(gogerald): right now, gaia server needs to distinguish the source from
// signin_metrics::SOURCE_START_PAGE, signin_metrics::SOURCE_SETTINGS and
@@ -164,7 +164,7 @@
source = signin_metrics::SOURCE_SETTINGS;
}
url = net::AppendQueryParameter(url, signin::kSignInPromoQueryKeySource,
- base::IntToString(static_cast<int>(source)));
+ base::NumberToString(source));
return GURL(url);
}
@@ -191,9 +191,10 @@
GURL url(chrome::kChromeUIChromeSigninURL);
url = net::AppendQueryParameter(
url, signin::kSignInPromoQueryKeyAccessPoint,
- base::IntToString(static_cast<int>(access_point)));
- url = net::AppendQueryParameter(url, signin::kSignInPromoQueryKeyReason,
- base::IntToString(static_cast<int>(reason)));
+ base::NumberToString(static_cast<int>(access_point)));
+ url =
+ net::AppendQueryParameter(url, signin::kSignInPromoQueryKeyReason,
+ base::NumberToString(static_cast<int>(reason)));
if (auto_close) {
url = net::AppendQueryParameter(url, signin::kSignInPromoQueryKeyAutoClose,
"1");
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
index b8b3b3b5..49efc646 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
@@ -195,7 +195,7 @@
base::StringPiece(reinterpret_cast<const char*>(fingerprint.data),
sizeof(fingerprint.data)),
&base64_fingerprint);
- return base::UintToString(error) + base64_fingerprint;
+ return base::NumberToString(error) + base64_fingerprint;
}
void MigrateOldSettings(HostContentSettingsMap* map) {
@@ -619,7 +619,7 @@
// values, only doubles. Since this mildly depends on precision, it is
// better to store the value as a string.
dict->SetString(kSSLCertDecisionExpirationTimeKey,
- base::Int64ToString(expiration_time.ToInternalValue()));
+ base::NumberToString(expiration_time.ToInternalValue()));
}
// Extract the map of certificate fingerprints to errors from the setting.
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
index ebce29b..cab4239 100644
--- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
+++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -418,7 +418,7 @@
tab);
helper->GetBlockingPageForCurrentlyCommittedNavigationForTesting()
->CommandReceived(
- base::IntToString(security_interstitials::CMD_PROCEED));
+ base::NumberToString(security_interstitials::CMD_PROCEED));
nav_observer.Wait();
} else {
content::InterstitialPage* interstitial_page = tab->GetInterstitialPage();
diff --git a/chrome/browser/ssl/ssl_blocking_page_unittest.cc b/chrome/browser/ssl/ssl_blocking_page_unittest.cc
index 1afb9b2c..51fc9904 100644
--- a/chrome/browser/ssl/ssl_blocking_page_unittest.cc
+++ b/chrome/browser/ssl/ssl_blocking_page_unittest.cc
@@ -77,7 +77,7 @@
// Simulates a proceed action.
blocking_page->CommandReceived(
- base::IntToString(security_interstitials::CMD_PROCEED));
+ base::NumberToString(security_interstitials::CMD_PROCEED));
// Verifies that security interstitial proceeded event is observed.
observer.VerifyLatestSecurityInterstitialEvent(
diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc
index 948a8e28..fd98866 100644
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -642,7 +642,7 @@
WebContents* tab,
security_interstitials::SecurityInterstitialCommand command) {
tab->GetInterstitialPage()->GetDelegateForTesting()->CommandReceived(
- base::IntToString(command));
+ base::NumberToString(command));
}
network::mojom::NetworkContextParamsPtr CreateDefaultNetworkContextParams() {
@@ -3948,7 +3948,7 @@
tab);
helper->GetBlockingPageForCurrentlyCommittedNavigationForTesting()
->CommandReceived(
- base::IntToString(security_interstitials::CMD_PROCEED));
+ base::NumberToString(security_interstitials::CMD_PROCEED));
nav_observer.Wait();
} else {
ProceedThroughInterstitial(tab);
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc
index 236061a0..306bfb3 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.cc
+++ b/chrome/browser/status_icons/desktop_notification_balloon.cc
@@ -44,7 +44,7 @@
}
const std::string notification_id =
- kDesktopNotificationPrefix + base::IntToString(id_count_++);
+ kDesktopNotificationPrefix + base::NumberToString(id_count_++);
message_center::Notification notification(
message_center::NOTIFICATION_TYPE_SIMPLE, notification_id, title,
contents, gfx::Image(icon), base::string16(), GURL(), notifier_id, {},
diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc
index 2a8e5bc..c88d6fd 100644
--- a/chrome/browser/sync/test/integration/apps_helper.cc
+++ b/chrome/browser/sync/test/integration/apps_helper.cc
@@ -23,7 +23,7 @@
namespace {
std::string CreateFakeAppName(int index) {
- return "fakeapp" + base::IntToString(index);
+ return "fakeapp" + base::NumberToString(index);
}
} // namespace
diff --git a/chrome/browser/sync/test/integration/dictionary_helper.cc b/chrome/browser/sync/test/integration/dictionary_helper.cc
index e6fd2914..13d08f6 100644
--- a/chrome/browser/sync/test/integration/dictionary_helper.cc
+++ b/chrome/browser/sync/test/integration/dictionary_helper.cc
@@ -120,7 +120,7 @@
bool AddWords(int index, int n, const std::string& prefix) {
bool result = true;
for (int i = 0; i < n; ++i) {
- result &= AddWord(index, prefix + base::IntToString(i));
+ result &= AddWord(index, prefix + base::NumberToString(i));
}
return result;
}
diff --git a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
index 6c541e0..d7b0423 100644
--- a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
+++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc
@@ -36,7 +36,7 @@
const std::string& trace,
const base::TimeDelta& dt) {
printf("*RESULT %s: %s= %s ms\n", measurement.c_str(), trace.c_str(),
- base::Int64ToString(dt.InMilliseconds()).c_str());
+ base::NumberToString(dt.InMilliseconds()).c_str());
}
} // namespace sync_timing_helper
diff --git a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
index 89404d3..57d4aa3cb 100644
--- a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
@@ -129,7 +129,7 @@
0, bookmarks_helper::GetOtherNode(0), 0, "top");
for (int i = 0; i < 100; ++i) {
ASSERT_TRUE(
- bookmarks_helper::AddURL(0, top, 0, base::Int64ToString(i), url));
+ bookmarks_helper::AddURL(0, top, 0, base::NumberToString(i), url));
}
sync_service->FlushDirectory();
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 57bbc83..24d62df1 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -296,7 +296,7 @@
}
std::string SyncExtensionHelper::CreateFakeExtensionName(int index) {
- return extension_name_prefix_ + base::IntToString(index);
+ return extension_name_prefix_ + base::NumberToString(index);
}
bool SyncExtensionHelper::ExtensionNameToIndex(const std::string& name,
diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc
index d95a196..d86532920 100644
--- a/chrome/browser/sync/test/integration/themes_helper.cc
+++ b/chrome/browser/sync/test/integration/themes_helper.cc
@@ -23,7 +23,7 @@
// Make a name to pass to an extension helper.
std::string MakeName(int index) {
- return "faketheme" + base::IntToString(index);
+ return "faketheme" + base::NumberToString(index);
}
ThemeService* GetThemeService(Profile* profile) {
diff --git a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc
index e5756974..d1164e3 100644
--- a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc
@@ -97,7 +97,7 @@
ASSERT_TRUE(DictionaryMatchChecker().Wait());
for (int i = 0; i < num_clients(); ++i)
- dictionary_helper::AddWord(i, "foo" + base::IntToString(i));
+ dictionary_helper::AddWord(i, "foo" + base::NumberToString(i));
ASSERT_TRUE(DictionaryMatchChecker().Wait());
ASSERT_EQ(num_clients(),
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
index e933b82..feefab4a 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
@@ -21,7 +21,7 @@
void PutVersionToDB(int64_t version, LevelDBWrapper* db) {
DCHECK(db);
- db->Put(kDatabaseVersionKey, base::Int64ToString(version));
+ db->Put(kDatabaseVersionKey, base::NumberToString(version));
}
void PutServiceMetadataToDB(const ServiceMetadata& service_metadata,
@@ -49,7 +49,7 @@
std::string value;
bool success = tracker.SerializeToString(&value);
DCHECK(success);
- db->Put(kFileTrackerKeyPrefix + base::Int64ToString(tracker.tracker_id()),
+ db->Put(kFileTrackerKeyPrefix + base::NumberToString(tracker.tracker_id()),
value);
}
@@ -61,7 +61,7 @@
void PutFileTrackerDeletionToDB(int64_t tracker_id, LevelDBWrapper* db) {
DCHECK(db);
- db->Delete(kFileTrackerKeyPrefix + base::Int64ToString(tracker_id));
+ db->Delete(kFileTrackerKeyPrefix + base::NumberToString(tracker_id));
}
bool HasFileAsParent(const FileDetails& details, const std::string& file_id) {
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index d31d9cd..d6abcd4 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1659,7 +1659,7 @@
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
base::FilePath path = BuildDisplayPathForTracker(tracker);
- dict->SetString("tracker_id", base::Int64ToString(tracker_id));
+ dict->SetString("tracker_id", base::NumberToString(tracker_id));
dict->SetString("path", path.AsUTF8Unsafe());
dict->SetString("file_id", tracker.file_id());
TrackerKind tracker_kind = tracker.tracker_kind();
@@ -1684,7 +1684,7 @@
dict->SetString("md5", details.md5());
dict->SetString("etag", details.etag());
dict->SetString("missing", details.missing() ? "true" : "false");
- dict->SetString("change_id", base::Int64ToString(details.change_id()));
+ dict->SetString("change_id", base::NumberToString(details.change_id()));
}
trackers->Append(std::move(dict));
}
@@ -1728,7 +1728,7 @@
dict->SetString("md5", details.md5());
dict->SetString("etag", details.etag());
dict->SetString("missing", details.missing() ? "true" : "false");
- dict->SetString("change_id", base::Int64ToString(details.change_id()));
+ dict->SetString("change_id", base::NumberToString(details.change_id()));
std::vector<base::StringPiece> parents;
for (int i = 0; i < details.parent_folder_ids_size(); ++i)
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
index ca536cf..01aaa7b 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
@@ -28,7 +28,7 @@
//
// NOTE
// - Entries are sorted by keys.
-// - int64_t value is serialized as a string by base::Int64ToString().
+// - int64_t value is serialized as a string by base::NumberToString().
// - ServiceMetadata, FileMetadata, and FileTracker values are serialized
// as a string by SerializeToString() of protocol buffers.
//
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
index d092a60..91f9d15 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
@@ -23,7 +23,7 @@
//
// NOTE
// - Entries are sorted by keys.
-// - int64_t value is serialized as a string by base::Int64ToString().
+// - int64_t value is serialized as a string by base::NumberToString().
// - ServiceMetadata, FileMetadata, and FileTracker values are serialized
// as a string by SerializeToString() of protocol buffers.
//
@@ -143,11 +143,11 @@
}
std::string GenerateDirtyIDKey(int64_t tracker_id) {
- return kDirtyIDKeyPrefix + base::Int64ToString(tracker_id);
+ return kDirtyIDKeyPrefix + base::NumberToString(tracker_id);
}
std::string GenerateDemotedDirtyIDKey(int64_t tracker_id) {
- return kDemotedDirtyIDKeyPrefix + base::Int64ToString(tracker_id);
+ return kDemotedDirtyIDKeyPrefix + base::NumberToString(tracker_id);
}
void RemoveUnreachableItemsFromDB(LevelDBWrapper* db,
@@ -314,7 +314,7 @@
bool MetadataDatabaseIndexOnDisk::GetFileTracker(int64_t tracker_id,
FileTracker* tracker) const {
const std::string key =
- kFileTrackerKeyPrefix + base::Int64ToString(tracker_id);
+ kFileTrackerKeyPrefix + base::NumberToString(tracker_id);
std::string value;
leveldb::Status status = db_->Get(key, &value);
@@ -765,7 +765,7 @@
DeleteTrackerIndexes();
BuildTrackerIndexes();
db_->Put(kLastValidationTimeKey,
- base::Int64ToString(base::Time::Now().ToInternalValue()));
+ base::NumberToString(base::Time::Now().ToInternalValue()));
} else {
num_dirty_trackers_ = CountDirtyTrackerInternal();
}
@@ -782,7 +782,7 @@
const std::string db_key = GenerateAppRootIDByAppIDKey(tracker.app_id());
DCHECK(tracker.active());
DCHECK(!DBHasKey(db_key));
- db_->Put(db_key, base::Int64ToString(tracker.tracker_id()));
+ db_->Put(db_key, base::NumberToString(tracker.tracker_id()));
}
void MetadataDatabaseIndexOnDisk::UpdateInAppIDIndex(
@@ -805,7 +805,7 @@
DCHECK(!DBHasKey(key));
DVLOG(1) << " Add to App root by App ID: " << new_tracker.app_id();
- db_->Put(key, base::Int64ToString(new_tracker.tracker_id()));
+ db_->Put(key, base::NumberToString(new_tracker.tracker_id()));
}
}
@@ -849,7 +849,7 @@
const std::string& file_id = new_tracker.file_id();
const std::string prefix = GenerateTrackerIDByFileIDKeyPrefix(file_id);
- DCHECK(DBHasKey(prefix + base::Int64ToString(new_tracker.tracker_id())));
+ DCHECK(DBHasKey(prefix + base::NumberToString(new_tracker.tracker_id())));
if (old_tracker.active() && !new_tracker.active()) {
DeactivateInTrackerIDSetWithPrefix(
@@ -1106,7 +1106,7 @@
const FileTracker& tracker) {
DCHECK(tracker.tracker_id());
- const std::string id_str = base::Int64ToString(tracker.tracker_id());
+ const std::string id_str = base::NumberToString(tracker.tracker_id());
db_->Put(key_prefix + id_str, std::string());
if (tracker.active())
db_->Put(active_tracker_key, id_str);
@@ -1117,7 +1117,7 @@
const std::string& key_prefix,
int64_t tracker_id) {
std::string value;
- const std::string del_key = key_prefix + base::Int64ToString(tracker_id);
+ const std::string del_key = key_prefix + base::NumberToString(tracker_id);
leveldb::Status status = db_->Get(del_key, &value);
if (status.IsNotFound())
return false;
@@ -1138,7 +1138,7 @@
const std::string& active_tracker_key,
const std::string& key_prefix,
int64_t tracker_id) {
- DCHECK(DBHasKey(key_prefix + base::Int64ToString(tracker_id)));
+ DCHECK(DBHasKey(key_prefix + base::NumberToString(tracker_id)));
std::string value;
leveldb::Status status = db_->Get(active_tracker_key, &value);
@@ -1146,7 +1146,7 @@
if (status.IsNotFound() ||
(status.ok() && base::StringToInt64(value, &active_tracker_id))) {
DCHECK(active_tracker_id != tracker_id);
- db_->Put(active_tracker_key, base::Int64ToString(tracker_id));
+ db_->Put(active_tracker_key, base::NumberToString(tracker_id));
}
}
@@ -1154,7 +1154,7 @@
const std::string& active_tracker_key,
const std::string& key_prefix,
int64_t tracker_id) {
- DCHECK(DBHasKey(key_prefix + base::Int64ToString(tracker_id)));
+ DCHECK(DBHasKey(key_prefix + base::NumberToString(tracker_id)));
std::string value;
leveldb::Status status = db_->Get(active_tracker_key, &value);
@@ -1188,7 +1188,7 @@
MetadataDatabaseIndexOnDisk::NumEntries
MetadataDatabaseIndexOnDisk::CountWithPrefix(const std::string& prefix,
int64_t ignored_id) {
- const std::string ignored = base::Int64ToString(ignored_id);
+ const std::string ignored = base::NumberToString(ignored_id);
size_t count = 0;
std::unique_ptr<LevelDBWrapper::Iterator> itr(db_->NewIterator());
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
index e1dac42..dc606f2 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
@@ -206,7 +206,7 @@
EXPECT_TRUE(db->Commit().ok());
const std::string key =
- kFileTrackerKeyPrefix + base::Int64ToString(kOrphanedFileTrackerID);
+ kFileTrackerKeyPrefix + base::NumberToString(kOrphanedFileTrackerID);
std::string value;
EXPECT_TRUE(db->Get(key, &value).ok());
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
index 6517f12..a769afb8f 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -205,7 +205,7 @@
protected:
std::string GenerateFileID() {
- return "file_id_" + base::Int64ToString(next_file_id_number_++);
+ return "file_id_" + base::NumberToString(next_file_id_number_++);
}
int64_t GetTrackerIDByFileID(const std::string& file_id) {
@@ -287,7 +287,7 @@
std::unique_ptr<LevelDBWrapper> wrapper(new LevelDBWrapper(std::move(db)));
- wrapper->Put(kDatabaseVersionKey, base::Int64ToString(3));
+ wrapper->Put(kDatabaseVersionKey, base::NumberToString(3));
SetUpServiceMetadata(wrapper.get());
return wrapper;
@@ -320,8 +320,8 @@
details->add_parent_folder_ids(parent.file_id());
details->set_title(title);
details->set_file_kind(FILE_KIND_FILE);
- details->set_md5(
- "md5_value_" + base::Int64ToString(next_md5_sequence_number_++));
+ details->set_md5("md5_value_" +
+ base::NumberToString(next_md5_sequence_number_++));
details->set_change_id(current_change_id_);
return file;
}
@@ -458,8 +458,8 @@
void ApplyContentChangeToMetadata(FileMetadata* file) {
FileDetails* details = file->mutable_details();
- details->set_md5(
- "md5_value_" + base::Int64ToString(next_md5_sequence_number_++));
+ details->set_md5("md5_value_" +
+ base::NumberToString(next_md5_sequence_number_++));
details->set_change_id(++current_change_id_);
}
@@ -570,7 +570,7 @@
tracker.tracker_id(), &tracker_in_metadata_database));
SCOPED_TRACE("Expect equivalent tracker[" +
- base::Int64ToString(tracker.tracker_id()) + "]");
+ base::NumberToString(tracker.tracker_id()) + "]");
ExpectEquivalent(&tracker, &tracker_in_metadata_database);
}
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
index b8eb17a0..a97973d 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
@@ -112,8 +112,7 @@
*sync_root_tracker.mutable_synced_details() = sync_root_details;
sync_root_tracker.set_active(true);
- db->Put(kDatabaseVersionKey,
- base::Int64ToString(kCurrentDatabaseVersion));
+ db->Put(kDatabaseVersionKey, base::NumberToString(kCurrentDatabaseVersion));
PutServiceMetadataToDB(service_metadata, db);
PutFileMetadataToDB(sync_root_metadata, db);
PutFileTrackerToDB(sync_root_tracker, db);
diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
index b13e4fc2..e009130 100644
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -98,8 +98,8 @@
response_code =
simple_url_loader_->ResponseInfo()->headers->response_code();
}
- feedback =
- "Uploading failed, response code: " + base::IntToString(response_code);
+ feedback = "Uploading failed, response code: " +
+ base::NumberToString(response_code);
}
base::PostTaskWithTraits(
diff --git a/chrome/browser/ui/android/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
index 646fe3f..db9b27d 100644
--- a/chrome/browser/ui/android/usb_chooser_dialog_android.cc
+++ b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
@@ -93,7 +93,7 @@
DCHECK_LE(index, item_id_map_.size());
int item_id = next_item_id_++;
- std::string item_id_str = base::IntToString(item_id);
+ std::string item_id_str = base::NumberToString(item_id);
item_id_map_.insert(item_id_map_.begin() + index, item_id_str);
base::string16 device_name = controller_->GetOption(index);
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
index 98b4463..28eb8e0fb 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
@@ -777,7 +777,7 @@
for (int i = 0; i < max_items_in_first_page - 1; ++i) {
std::unique_ptr<ChromeAppListItem> item =
std::make_unique<ChromeAppListItem>(
- profile_.get(), GenerateId("item_id" + base::IntToString(i)),
+ profile_.get(), GenerateId("item_id" + base::NumberToString(i)),
model_updater());
item->SetPosition(last_app_position);
model_updater()->AddItem(std::move(item));
@@ -803,7 +803,7 @@
std::unique_ptr<ChromeAppListItem> app_item =
std::make_unique<ChromeAppListItem>(
profile_.get(),
- GenerateId("item_id" + base::IntToString(max_items_in_first_page)),
+ GenerateId("item_id" + base::NumberToString(max_items_in_first_page)),
model_updater());
app_item->SetPosition(last_app_position.CreateBetween(page_break_position));
model_updater()->AddItem(std::move(app_item));
@@ -825,7 +825,7 @@
for (int i = 0; i < max_items_in_first_page - 1; ++i) {
std::unique_ptr<ChromeAppListItem> item =
std::make_unique<ChromeAppListItem>(
- profile_.get(), GenerateId("item_id" + base::IntToString(i)),
+ profile_.get(), GenerateId("item_id" + base::NumberToString(i)),
model_updater());
item->SetPosition(last_app_position);
model_updater()->AddItem(std::move(item));
diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
index 790e7606..dbccbac8 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
@@ -786,7 +786,7 @@
const base::Time time = base::Time::Now();
arc::ArcAppScopedPrefUpdate update(prefs_, app_id, arc::prefs::kArcApps);
base::DictionaryValue* app_dict = update.Get();
- const std::string string_value = base::Int64ToString(time.ToInternalValue());
+ const std::string string_value = base::NumberToString(time.ToInternalValue());
app_dict->SetString(kLastLaunchTime, string_value);
for (auto& observer : observer_list_)
@@ -1102,7 +1102,7 @@
// actual install time in Android side.
if (GetInstallTime(app_id).is_null()) {
std::string install_time_str =
- base::Int64ToString(base::Time::Now().ToInternalValue());
+ base::NumberToString(base::Time::Now().ToInternalValue());
app_dict->SetString(kInstallTime, install_time_str);
}
@@ -1213,8 +1213,8 @@
arc::prefs::kArcPackages);
base::DictionaryValue* package_dict = update.Get();
const std::string id_str =
- base::Int64ToString(package.last_backup_android_id);
- const std::string time_str = base::Int64ToString(package.last_backup_time);
+ base::NumberToString(package.last_backup_android_id);
+ const std::string time_str = base::NumberToString(package.last_backup_time);
int old_package_version = -1;
package_dict->GetInteger(kPackageVersion, &old_package_version);
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index b952c7b..c229d30 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -68,7 +68,7 @@
void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
GURL url = GURL(kChromeUIBookmarksURL)
.Resolve(base::StringPrintf(
- "/?id=%s", base::Int64ToString(node_id).c_str()));
+ "/?id=%s", base::NumberToString(node_id).c_str()));
NavigateParams params(GetSingletonTabNavigateParams(browser, url));
params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
ShowSingletonTabOverwritingNTP(browser, std::move(params));
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
index 22185ef..b3af115 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -151,7 +151,7 @@
web_contents->GetInterstitialPage();
ASSERT_TRUE(interstitial);
interstitial->GetDelegateForTesting()->CommandReceived(
- base::IntToString(security_interstitials::CMD_PROCEED));
+ base::NumberToString(security_interstitials::CMD_PROCEED));
}
observer.Wait();
}
diff --git a/chrome/browser/ui/input_method/input_method_engine_base.cc b/chrome/browser/ui/input_method/input_method_engine_base.cc
index bb087ac..55cc8b9 100644
--- a/chrome/browser/ui/input_method/input_method_engine_base.cc
+++ b/chrome/browser/ui/input_method/input_method_engine_base.cc
@@ -420,7 +420,7 @@
std::string InputMethodEngineBase::AddRequest(
const std::string& component_id,
ui::IMEEngineHandlerInterface::KeyEventDoneCallback key_data) {
- std::string request_id = base::IntToString(next_request_id_);
+ std::string request_id = base::NumberToString(next_request_id_);
++next_request_id_;
request_map_[request_id] = std::make_pair(component_id, std::move(key_data));
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc
index cf775da..9e20104 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc
@@ -183,7 +183,7 @@
base::string16 query = base::ASCIIToUTF16(" text");
for (size_t i = 0; i < cases.size(); ++i) {
- SCOPED_TRACE("case #" + base::IntToString(i));
+ SCOPED_TRACE("case #" + base::NumberToString(i));
// The keyword should always exist at the beginning.
EXPECT_TRUE(model()->GetTemplateURLForKeyword(cases[i].keyword) != nullptr);
@@ -284,7 +284,7 @@
true},
};
for (size_t i = 0; i < base::size(cases); ++i) {
- SCOPED_TRACE("case #" + base::IntToString(i));
+ SCOPED_TRACE("case #" + base::NumberToString(i));
const Case& test_case = cases[i];
const Response& response = test_case.response;
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 0d8d67b3..2bf2ac84 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -163,7 +163,7 @@
using password_bubble_experiment::kSmartBubbleThresholdParam;
std::map<std::string, std::string> params;
params[kSmartBubbleThresholdParam] =
- base::IntToString(kGreatDissmisalCount / 2);
+ base::NumberToString(kGreatDissmisalCount / 2);
variations::AssociateVariationParams(kSmartBubbleExperimentName, "A", params);
ASSERT_TRUE(
base::FieldTrialList::CreateFieldTrial(kSmartBubbleExperimentName, "A"));
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index 6dc1df0..be2f464 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -419,7 +419,7 @@
if (i > 0)
actual += " ";
- actual += base::IntToString(GetID(model.GetWebContentsAt(i)));
+ actual += base::NumberToString(GetID(model.GetWebContentsAt(i)));
if (model.IsTabPinned(i))
actual += "p";
@@ -1336,7 +1336,7 @@
for (size_t i = 0; i < indices.size(); ++i) {
if (i != 0)
result += " ";
- result += base::IntToString(indices[i]);
+ result += base::NumberToString(indices[i]);
}
return result;
};
diff --git a/chrome/browser/ui/task_manager/task_manager_table_model.cc b/chrome/browser/ui/task_manager/task_manager_table_model.cc
index 19cb421c..9d9a131 100644
--- a/chrome/browser/ui/task_manager/task_manager_table_model.cc
+++ b/chrome/browser/ui/task_manager/task_manager_table_model.cc
@@ -187,13 +187,13 @@
if (nacl_port == nacl::kGdbDebugStubPortUnknown)
return unknown_string_;
- return base::IntToString16(nacl_port);
+ return base::NumberToString16(nacl_port);
}
base::string16 GetWindowsHandlesText(int64_t current, int64_t peak) {
return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT,
- base::Int64ToString16(current),
- base::Int64ToString16(peak));
+ base::NumberToString16(current),
+ base::NumberToString16(peak));
}
base::string16 GetNetworkUsageText(int64_t network_usage) {
@@ -209,7 +209,7 @@
}
base::string16 GetProcessIdText(base::ProcessId proc_id) {
- return base::IntToString16(proc_id);
+ return base::NumberToString16(proc_id);
}
base::string16 FormatAllocatedAndUsedMemory(int64_t allocated, int64_t used) {
@@ -227,7 +227,7 @@
base::string16 GetKeepaliveCountText(int keepalive_count) const {
if (keepalive_count < 0)
return n_a_string();
- return base::IntToString16(keepalive_count);
+ return base::NumberToString16(keepalive_count);
}
const base::string16& n_a_string() const { return n_a_string_; }
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index 66543de..3935133 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -449,7 +449,7 @@
metric_string += action;
if (index != -1) {
// +1 is for historical reasons (indices used to start at 1).
- metric_string += base::IntToString(index + 1);
+ metric_string += base::NumberToString(index + 1);
}
return metric_string;
}
diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
index 7388bdf..e66da11 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
@@ -43,11 +43,11 @@
}
std::string ToSessionTag(SessionID session_id) {
- return std::string(kBaseSessionTag + base::IntToString(session_id.id()));
+ return std::string(kBaseSessionTag + base::NumberToString(session_id.id()));
}
std::string ToSessionName(SessionID session_id) {
- return std::string(kBaseSessionName + base::IntToString(session_id.id()));
+ return std::string(kBaseSessionName + base::NumberToString(session_id.id()));
}
std::string ToTabTitle(SessionID session_id,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 66d30a452..392c11b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -392,8 +392,8 @@
model_->AddURL(f1, 2, ASCIIToUTF16("f1b"), GURL(test_base + "f1b"));
if (big_menu) {
for (int i = 1; i <= 100; ++i) {
- model_->AddURL(f1, i + 1, ASCIIToUTF16("f") + base::IntToString16(i),
- GURL(test_base + "f" + base::IntToString(i)));
+ model_->AddURL(f1, i + 1, ASCIIToUTF16("f") + base::NumberToString16(i),
+ GURL(test_base + "f" + base::NumberToString(i)));
}
}
model_->AddURL(bb_node, 1, ASCIIToUTF16("a"), GURL(test_base + "a"));
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
index 09f7a2f..d195b28 100644
--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
+++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
@@ -126,7 +126,7 @@
const int incognito_window_count =
BrowserList::GetIncognitoSessionsActiveForProfile(profile_);
if (incognito_window_count > 1) {
- text = base::IntToString16(incognito_window_count);
+ text = base::NumberToString16(incognito_window_count);
if (GetThemeProvider()) {
color = GetThemeProvider()->GetColor(
ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc
index ee009c6..61cb3a8 100644
--- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc
+++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc
@@ -265,7 +265,7 @@
result += " ";
if (i == active_index())
result += "[";
- result += base::IntToString(view_model_->ideal_bounds(i).x());
+ result += base::NumberToString(view_model_->ideal_bounds(i).x());
if (i == active_index())
result += "]";
}
diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc
index 4bd125e..05307e42 100644
--- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc
+++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc
@@ -103,7 +103,7 @@
for (int i = 0; i < view_model_.view_size(); ++i) {
if (!result.empty())
result += " ";
- result += base::IntToString(view_model_.ideal_bounds(i).x());
+ result += base::NumberToString(view_model_.ideal_bounds(i).x());
}
return result;
}
@@ -115,7 +115,7 @@
result += " ";
if (i == active_index)
result += "[";
- result += base::IntToString(view_model_.ideal_bounds(i).x());
+ result += base::NumberToString(view_model_.ideal_bounds(i).x());
if (i == active_index)
result += "]";
}
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index b9513ea..3d7653e 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -184,7 +184,7 @@
contents->GetUserData(
&kTabDragControllerInteractiveUITestUserDataKey));
if (user_data)
- result += base::IntToString(user_data->id());
+ result += base::NumberToString(user_data->id());
else
result += "?";
}
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc
index 39405f4..6e830de8 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc
@@ -20,8 +20,8 @@
for (const auto& bounds : tabs_bounds) {
if (!result.empty())
result += ", ";
- result +=
- base::IntToString(bounds.x()) + " " + base::IntToString(bounds.width());
+ result += base::NumberToString(bounds.x()) + " " +
+ base::NumberToString(bounds.width());
}
return result;
}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
index 5c11e0ec..3db6ee6 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
@@ -261,7 +261,7 @@
// is spread across multiple rows.
for (int i = 0; i < 15; ++i) {
scoped_refptr<const extensions::Extension> extension =
- extensions::ExtensionBuilder(base::IntToString(i))
+ extensions::ExtensionBuilder(base::NumberToString(i))
.SetAction(extensions::ExtensionBuilder::ActionType::BROWSER_ACTION)
.SetLocation(extensions::Manifest::INTERNAL)
.Build();
diff --git a/chrome/browser/ui/web_applications/bookmark_app_browsertest.cc b/chrome/browser/ui/web_applications/bookmark_app_browsertest.cc
index 3b4bef9..a345bc0 100644
--- a/chrome/browser/ui/web_applications/bookmark_app_browsertest.cc
+++ b/chrome/browser/ui/web_applications/bookmark_app_browsertest.cc
@@ -50,7 +50,7 @@
}
GURL GetUrlForSuffix(const std::string& prefix, int suffix) {
- return GURL(prefix + base::IntToString(suffix) + ".com/");
+ return GURL(prefix + base::NumberToString(suffix) + ".com/");
}
// Must be zero-based as this will be stored in a bitset.
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 3524d74..3a2a079 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -508,7 +508,7 @@
output->append("<meta charset='utf-8'>\n");
if (refresh > 0) {
output->append("<meta http-equiv='refresh' content='");
- output->append(base::IntToString(refresh));
+ output->append(base::NumberToString(refresh));
output->append("'/>\n");
}
}
diff --git a/chrome/browser/ui/webui/certificates_handler.cc b/chrome/browser/ui/webui/certificates_handler.cc
index fe03c25..799279d 100644
--- a/chrome/browser/ui/webui/certificates_handler.cc
+++ b/chrome/browser/ui/webui/certificates_handler.cc
@@ -1015,7 +1015,7 @@
// Move the CertInfo into |cert_info_id_map_|.
CertificateManagerModel::CertInfo* cert_info = org_cert.get();
std::string id =
- base::IntToString(cert_info_id_map_.Add(std::move(org_cert)));
+ base::NumberToString(cert_info_id_map_.Add(std::move(org_cert)));
base::DictionaryValue cert_dict;
cert_dict.SetKey(kCertificatesHandlerKeyField, base::Value(id));
diff --git a/chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_pin_setup.cc b/chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_pin_setup.cc
index b3747d6..1beaa08 100644
--- a/chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_pin_setup.cc
+++ b/chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_pin_setup.cc
@@ -82,7 +82,7 @@
// Format numbers to be used on the pin keyboard.
for (int j = 0; j <= 9; j++) {
- builder->Add("pinKeyboard" + base::IntToString(j),
+ builder->Add("pinKeyboard" + base::NumberToString(j),
base::FormatNumber(int64_t{j}));
}
builder->Add("pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN);
diff --git a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
index 03f0584..0bd7f65f 100644
--- a/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_handler.cc
@@ -479,7 +479,7 @@
const std::string description = base::StringPrintf(
"Auto generated feedback for http://crbug.com/719266.\n"
"(uniquifier:%s)",
- base::Int64ToString(base::Time::Now().ToInternalValue()).c_str());
+ base::NumberToString(base::Time::Now().ToInternalValue()).c_str());
login_feedback_.reset(new LoginFeedback(Profile::FromWebUI(web_ui())));
login_feedback_->Request(description, base::Closure());
}
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc
index 095fab6..9192c59 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc
@@ -98,7 +98,7 @@
auto config_properties = ash::mojom::DisplayConfigProperties::New();
config_properties->set_primary = true;
cros_display_config_ptr_->SetDisplayProperties(
- base::Int64ToString(device.target_display_id),
+ base::NumberToString(device.target_display_id),
std::move(config_properties), base::DoNothing());
break;
}
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 0323e94..b4555044 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -302,7 +302,7 @@
::login::LocalizedValuesBuilder* builder) {
// Format numbers to be used on the pin keyboard.
for (int j = 0; j <= 9; j++) {
- builder->Add("pinKeyboard" + base::IntToString(j),
+ builder->Add("pinKeyboard" + base::NumberToString(j),
base::FormatNumber(int64_t{j}));
}
@@ -1497,7 +1497,7 @@
const std::string description = base::StringPrintf(
"Auto generated feedback for http://crbug.com/547857.\n"
"(uniquifier:%s)",
- base::Int64ToString(base::Time::Now().ToInternalValue()).c_str());
+ base::NumberToString(base::Time::Now().ToInternalValue()).c_str());
login_feedback_ =
std::make_unique<LoginFeedback>(Profile::FromWebUI(web_ui()));
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
index f5a3c69..aad0f6d 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -79,11 +79,11 @@
std::string CookiesTreeModelUtil::GetTreeNodeId(const CookieTreeNode* node) {
CookieTreeNodeMap::const_iterator iter = node_map_.find(node);
if (iter != node_map_.end())
- return base::IntToString(iter->second);
+ return base::NumberToString(iter->second);
int32_t new_id = id_map_.Add(node);
node_map_[node] = new_id;
- return base::IntToString(new_id);
+ return base::NumberToString(new_id);
}
bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc b/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc
index 82f47b9..ac4a25d 100644
--- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.cc
@@ -23,7 +23,7 @@
void IdentityInternalsUIBrowserTest::SetupTokenCache(int number_of_tokens) {
for (int number = 0; number < number_of_tokens; ++number) {
- const std::string token_number = base::IntToString(number);
+ const std::string token_number = base::NumberToString(number);
std::string token_id("token");
token_id += token_number;
std::string extension_id("extension");
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index 4545cb1..78babd6 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -194,9 +194,9 @@
case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break;
default: os_label += " UNKNOWN"; break;
}
- os_label += " SP" + base::IntToString(os->service_pack().major);
+ os_label += " SP" + base::NumberToString(os->service_pack().major);
if (os->service_pack().minor > 0)
- os_label += "." + base::IntToString(os->service_pack().minor);
+ os_label += "." + base::NumberToString(os->service_pack().minor);
if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
os_label += " 64 bit";
#endif
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 8d62019b..605023b 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -113,10 +113,10 @@
int offset = GetLayoutConstant(BOOKMARK_BAR_NTP_HEIGHT);
if (alignment & ThemeProperties::ALIGN_LEFT)
- return "left " + base::IntToString(-offset) + "px";
+ return "left " + base::NumberToString(-offset) + "px";
else if (alignment & ThemeProperties::ALIGN_RIGHT)
- return "right " + base::IntToString(-offset) + "px";
- return "center " + base::IntToString(-offset) + "px";
+ return "right " + base::NumberToString(-offset) + "px";
+ return "center " + base::NumberToString(-offset) + "px";
}
return ThemeProperties::AlignmentToString(alignment);
diff --git a/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc b/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
index 46184041..6ad0ddf 100644
--- a/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_tool_ui_browsertest.cc
@@ -281,9 +281,9 @@
base::Time initial_time = base::Time::Now();
for (int i = 0; i < count; ++i) {
contents.SetPath({"chromePolicies", "SessionId", "value"},
- base::Value(base::IntToString(i)));
+ base::Value(base::NumberToString(i)));
base::FilePath::StringType session_name =
- base::FilePath::FromUTF8Unsafe(base::IntToString(i)).value();
+ base::FilePath::FromUTF8Unsafe(base::NumberToString(i)).value();
std::string stringified_contents;
base::JSONWriter::Write(contents, &stringified_contents);
base::WriteFile(GetSessionPath(session_name), stringified_contents.c_str(),
@@ -642,7 +642,7 @@
std::unique_ptr<base::ListValue> sessions = ExtractSessionsList();
base::ListValue expected;
for (int i = 4; i >= 0; --i) {
- expected.GetList().push_back(base::Value(base::IntToString(i)));
+ expected.GetList().push_back(base::Value(base::NumberToString(i)));
}
EXPECT_EQ(expected, *sessions);
}
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
index 9f661c8..ab7ba485 100644
--- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -84,7 +84,7 @@
ColorCapability color;
{
Color standard_color(STANDARD_COLOR);
- standard_color.vendor_id = base::IntToString(COLOR);
+ standard_color.vendor_id = base::NumberToString(COLOR);
color.AddDefaultOption(standard_color, true);
}
color.SaveTo(&description);
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
index 1cffd73..9fa7dab 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
@@ -456,7 +456,7 @@
handler()->reset_calls();
base::Value args(base::Value::Type::LIST);
std::string callback_id_in =
- "test-callback-id-" + base::UintToString(i + 1);
+ "test-callback-id-" + base::NumberToString(i + 1);
args.GetList().emplace_back(callback_id_in);
args.GetList().emplace_back(type);
std::unique_ptr<base::ListValue> list_args =
@@ -502,7 +502,7 @@
handler()->reset_calls();
base::Value args(base::Value::Type::LIST);
std::string callback_id_in =
- "test-callback-id-" + base::UintToString(i + 1);
+ "test-callback-id-" + base::NumberToString(i + 1);
args.GetList().emplace_back(callback_id_in);
args.GetList().emplace_back(kDummyPrinterName);
args.GetList().emplace_back(type);
@@ -531,7 +531,8 @@
handler()->reset_calls();
base::Value args(base::Value::Type::LIST);
std::string callback_id_in =
- "test-callback-id-" + base::UintToString(i + base::size(kAllTypes) + 1);
+ "test-callback-id-" +
+ base::NumberToString(i + base::size(kAllTypes) + 1);
args.GetList().emplace_back(callback_id_in);
args.GetList().emplace_back("EmptyPrinter");
args.GetList().emplace_back(type);
@@ -562,7 +563,7 @@
handler()->reset_calls();
base::Value args(base::Value::Type::LIST);
std::string callback_id_in =
- "test-callback-id-" + base::UintToString(i + 1);
+ "test-callback-id-" + base::NumberToString(i + 1);
args.GetList().emplace_back(callback_id_in);
base::Value print_ticket = GetPrintTicket(type, cloud);
std::string json;
@@ -737,7 +738,7 @@
handler()->reset_calls();
base::Value args(base::Value::Type::LIST);
std::string callback_id_in =
- "test-callback-id-" + base::UintToString(i + 1);
+ "test-callback-id-" + base::NumberToString(i + 1);
args.GetList().emplace_back(callback_id_in);
args.GetList().emplace_back(kDummyPrinterName);
args.GetList().emplace_back(type);
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 5a4b72f..46f45b57 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -679,7 +679,7 @@
event->SetBoolean("rollback", rollback);
event->SetString("version", version);
// DictionaryValue does not support int64_t, so convert to string.
- event->SetString("size", base::Int64ToString(size));
+ event->SetString("size", base::NumberToString(size));
#if defined(OS_CHROMEOS)
if (status == VersionUpdater::FAILED_OFFLINE ||
status == VersionUpdater::FAILED_CONNECTION_TYPE_DISALLOWED) {
diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
index 4f0138f..dc4e23c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
@@ -302,10 +302,10 @@
status_text = l10n_util::GetStringFUTF16(
charging ? IDS_SETTINGS_BATTERY_STATUS_CHARGING
: IDS_SETTINGS_BATTERY_STATUS,
- base::IntToString16(percent), GetBatteryTimeText(time_left));
+ base::NumberToString16(percent), GetBatteryTimeText(time_left));
} else {
status_text = l10n_util::GetStringFUTF16(IDS_SETTINGS_BATTERY_STATUS_SHORT,
- base::IntToString16(percent));
+ base::NumberToString16(percent));
}
base::DictionaryValue battery_dict;
diff --git a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
index 7ddc716..9b7cf3f1 100644
--- a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
@@ -232,7 +232,7 @@
for (int i = 1; i <= kMaxAllowedFingerprints; ++i) {
std::string fingerprint_name = l10n_util::GetStringFUTF8(
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME,
- base::IntToString16(i));
+ base::NumberToString16(i));
if (!base::ContainsValue(fingerprints_labels_, fingerprint_name)) {
fp_service_->StartEnrollSession(user_id_, fingerprint_name);
break;
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index a6791dbe..8598c93a 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1808,7 +1808,7 @@
// Format numbers to be used on the pin keyboard.
for (int j = 0; j <= 9; j++) {
- html_source->AddString("pinKeyboard" + base::IntToString(j),
+ html_source->AddString("pinKeyboard" + base::NumberToString(j),
base::FormatNumber(int64_t{j}));
}
diff --git a/chrome/browser/ui/webui/snippets_internals/snippets_internals_page_handler.cc b/chrome/browser/ui/webui/snippets_internals/snippets_internals_page_handler.cc
index b43444e..f143a6ce 100644
--- a/chrome/browser/ui/webui/snippets_internals/snippets_internals_page_handler.cc
+++ b/chrome/browser/ui/webui/snippets_internals/snippets_internals_page_handler.cc
@@ -102,7 +102,7 @@
auto item = snippets_internals::mojom::SuggestionItem::New();
item->suggestionTitle = base::UTF16ToUTF8(suggestion.title());
item->suggestionIdWithinCategory = suggestion.id().id_within_category();
- item->suggestionId = "content-suggestion-" + base::IntToString(index);
+ item->suggestionId = "content-suggestion-" + base::NumberToString(index);
item->url = suggestion.url().spec();
item->faviconUrl = suggestion.url_with_favicon().spec();
item->snippet = base::UTF16ToUTF8(suggestion.snippet_text());
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
index d1ce163..bf522660 100644
--- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
@@ -144,8 +144,9 @@
} else {
base::DictionaryValue dict;
dict.SetDouble(kZoomLevelPath, level);
- dict.SetString(kLastModifiedPath,
- base::Int64ToString(change.last_modified.ToInternalValue()));
+ dict.SetString(
+ kLastModifiedPath,
+ base::NumberToString(change.last_modified.ToInternalValue()));
host_zoom_dictionary_weak->SetKey(change.host, std::move(dict));
}
}
diff --git a/chrome/browser/web_applications/components/web_app_shortcut_linux.cc b/chrome/browser/web_applications/components/web_app_shortcut_linux.cc
index fc09135..a2d48d968 100644
--- a/chrome/browser/web_applications/components/web_app_shortcut_linux.cc
+++ b/chrome/browser/web_applications/components/web_app_shortcut_linux.cc
@@ -75,7 +75,7 @@
argv.push_back("user");
argv.push_back("--size");
- argv.push_back(base::IntToString(width));
+ argv.push_back(base::NumberToString(width));
argv.push_back(temp_file_path.value());
argv.push_back(icon_name);
diff --git a/chrome/browser/web_applications/web_app_database_unittest.cc b/chrome/browser/web_applications/web_app_database_unittest.cc
index 0672a79..01fac60 100644
--- a/chrome/browser/web_applications/web_app_database_unittest.cc
+++ b/chrome/browser/web_applications/web_app_database_unittest.cc
@@ -78,11 +78,13 @@
static std::unique_ptr<WebApp> CreateWebApp(const std::string& base_url,
int suffix) {
- const auto launch_url = base_url + base::IntToString(suffix);
+ const auto launch_url = base_url + base::NumberToString(suffix);
const AppId app_id = GenerateAppIdFromURL(GURL(launch_url));
- const std::string name = "Name" + base::IntToString(suffix);
- const std::string description = "Description" + base::IntToString(suffix);
- const std::string scope = base_url + "/scope" + base::IntToString(suffix);
+ const std::string name = "Name" + base::NumberToString(suffix);
+ const std::string description =
+ "Description" + base::NumberToString(suffix);
+ const std::string scope =
+ base_url + "/scope" + base::NumberToString(suffix);
const base::Optional<SkColor> theme_color = suffix;
auto app = std::make_unique<WebApp>(app_id);
@@ -93,7 +95,8 @@
app->SetScope(GURL(scope));
app->SetThemeColor(theme_color);
- const std::string icon_url = base_url + "/icon" + base::IntToString(suffix);
+ const std::string icon_url =
+ base_url + "/icon" + base::NumberToString(suffix);
const int icon_size_in_px = 256;
WebApp::Icons icons;
@@ -247,7 +250,7 @@
WebApp::Icons icons;
for (int i = 1; i <= num_icons; ++i) {
const std::string icon_url =
- base_url + "/icon" + base::IntToString(num_icons);
+ base_url + "/icon" + base::NumberToString(num_icons);
// Let size equals the icon's number squared.
const int icon_size_in_px = i * i;
icons.push_back({GURL(icon_url), icon_size_in_px});
diff --git a/chrome/browser/web_applications/web_app_registrar_unittest.cc b/chrome/browser/web_applications/web_app_registrar_unittest.cc
index bcce3810..dceda363 100644
--- a/chrome/browser/web_applications/web_app_registrar_unittest.cc
+++ b/chrome/browser/web_applications/web_app_registrar_unittest.cc
@@ -22,7 +22,7 @@
Registry registry;
for (int i = 0; i < num_apps; ++i) {
- const auto url = base_url + base::IntToString(i);
+ const auto url = base_url + base::NumberToString(i);
const AppId app_id = GenerateAppIdFromURL(GURL(url));
auto web_app = std::make_unique<WebApp>(app_id);
registry.emplace(app_id, std::move(web_app));
diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
index 81f2394c..a6892db 100644
--- a/chrome/browser/win/chrome_process_finder.cc
+++ b/chrome/browser/win/chrome_process_finder.cc
@@ -46,7 +46,7 @@
base::CommandLine command_line(*base::CommandLine::ForCurrentProcess());
command_line.AppendSwitchASCII(
switches::kOriginalProcessStartTime,
- base::Int64ToString(
+ base::NumberToString(
base::Process::Current().CreationTime().ToInternalValue()));
if (fast_start)
