diff options
37 files changed, 108 insertions, 100 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index e2c9527..a964fcd 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -15,8 +15,8 @@ #include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/app_list/app_list_item.h" #include "ui/app_list/app_list_item_list.h" @@ -215,7 +215,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { for (int i = 0; i < static_cast<int>(WindowTypeShelfItem::LAST_TYPE); ++i) { WindowTypeShelfItem::Type type = static_cast<WindowTypeShelfItem::Type>(i); - std::string id = base::StringPrintf("%d", i); + std::string id = base::IntToString(i); scoped_ptr<WindowTypeShelfItem> shelf_item( new WindowTypeShelfItem(id, type)); model_->AddItem(shelf_item.Pass()); diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc index ed553cd..924c769 100644 --- a/base/debug/profiler.cc +++ b/base/debug/profiler.cc @@ -7,8 +7,8 @@ #include <string> #include "base/process/process_handle.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #if defined(OS_WIN) #include "base/win/pe_image.h" @@ -30,8 +30,8 @@ static int profile_count = 0; void StartProfiling(const std::string& name) { ++profile_count; std::string full_name(name); - std::string pid = StringPrintf("%d", GetCurrentProcId()); - std::string count = StringPrintf("%d", profile_count); + std::string pid = IntToString(GetCurrentProcId()); + std::string count = IntToString(profile_count); ReplaceSubstringsAfterOffset(&full_name, 0, "{pid}", pid); ReplaceSubstringsAfterOffset(&full_name, 0, "{count}", count); ProfilerStart(full_name.c_str()); diff --git a/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc index f1a1042..ed84d86 100644 --- a/base/metrics/field_trial_unittest.cc +++ b/base/metrics/field_trial_unittest.cc @@ -1021,9 +1021,9 @@ TEST_F(FieldTrialTest, FloatBoundariesGiveEqualGroupSizes) { scoped_refptr<base::FieldTrial> trial( new base::FieldTrial("test", kBucketCount, "default", entropy)); for (int j = 0; j < kBucketCount; ++j) - trial->AppendGroup(base::StringPrintf("%d", j), 1); + trial->AppendGroup(base::IntToString(j), 1); - EXPECT_EQ(base::StringPrintf("%d", i), trial->group_name()); + EXPECT_EQ(base::IntToString(i), trial->group_name()); } } diff --git a/base/process/process_linux.cc b/base/process/process_linux.cc index 88a310e..6e10dd2 100644 --- a/base/process/process_linux.cc +++ b/base/process/process_linux.cc @@ -10,6 +10,7 @@ #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/synchronization/lock.h" @@ -119,7 +120,7 @@ bool Process::SetProcessBackgrounded(bool background) { #if defined(OS_CHROMEOS) if (cgroups.Get().enabled) { - std::string pid = StringPrintf("%d", process_); + std::string pid = IntToString(process_); const base::FilePath file = background ? cgroups.Get().background_file : cgroups.Get().foreground_file; diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc index 6dff431..9c410fb 100644 --- a/chrome/browser/devtools/devtools_targets_ui.cc +++ b/chrome/browser/devtools/devtools_targets_ui.cc @@ -8,6 +8,7 @@ #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" @@ -480,8 +481,7 @@ void PortForwardingStatusSerializer::PortStatusChanged( const PortStatusMap& port_status_map = sit->second; for (PortStatusMap::const_iterator it = port_status_map.begin(); it != port_status_map.end(); ++it) { - port_status_dict->SetInteger( - base::StringPrintf("%d", it->first), it->second); + port_status_dict->SetInteger(base::IntToString(it->first), it->second); } base::DictionaryValue* device_status_dict = new base::DictionaryValue(); diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc index 3990606..332129a 100644 --- a/chrome/browser/download/download_commands.cc +++ b/chrome/browser/download/download_commands.cc @@ -4,7 +4,7 @@ #include "chrome/browser/download/download_commands.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_crx_util.h" #include "chrome/browser/download/download_extensions.h" @@ -67,8 +67,7 @@ GURL DownloadCommands::GetLearnMoreURLForInterruptedDownload() const { learn_more_url, g_browser_process->GetApplicationLocale()); return net::AppendQueryParameter( learn_more_url, "ctx", - base::StringPrintf("%d", - static_cast<int>(download_item_->GetLastReason()))); + base::IntToString(static_cast<int>(download_item_->GetLastReason()))); } gfx::Image DownloadCommands::GetCommandIcon(Command command) { diff --git a/chrome/browser/extensions/api/sessions/session_id.cc b/chrome/browser/extensions/api/sessions/session_id.cc index cc0f155..e1f2afe 100644 --- a/chrome/browser/extensions/api/sessions/session_id.cc +++ b/chrome/browser/extensions/api/sessions/session_id.cc @@ -5,7 +5,6 @@ #include "chrome/browser/extensions/api/sessions/session_id.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" namespace extensions { @@ -42,8 +41,8 @@ bool SessionId::IsForeign() const { std::string SessionId::ToString() const { return IsForeign() ? - (session_tag_ + kIdSeparator + base::StringPrintf("%d", id_)) - : base::StringPrintf("%d", id_); + (session_tag_ + kIdSeparator + base::IntToString(id_)) + : base::IntToString(id_); } } // namespace extensions diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index c0f7656..9c77d5c 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/storage/settings_sync_util.h" #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h" @@ -1431,8 +1431,7 @@ static void UnlimitedSyncStorageTestCallback(ValueStore* sync_storage) { // permission can't apply to sync. scoped_ptr<base::Value> kilobyte = util::CreateKilobyte(); for (int i = 0; i < 100; ++i) { - sync_storage->Set( - ValueStore::DEFAULTS, base::StringPrintf("%d", i), *kilobyte); + sync_storage->Set(ValueStore::DEFAULTS, base::IntToString(i), *kilobyte); } EXPECT_TRUE(sync_storage->Set(ValueStore::DEFAULTS, "WillError", *kilobyte) @@ -1443,8 +1442,7 @@ static void UnlimitedLocalStorageTestCallback(ValueStore* local_storage) { // Local storage should never run out. scoped_ptr<base::Value> megabyte = util::CreateMegabyte(); for (int i = 0; i < 7; ++i) { - local_storage->Set( - ValueStore::DEFAULTS, base::StringPrintf("%d", i), *megabyte); + local_storage->Set(ValueStore::DEFAULTS, base::IntToString(i), *megabyte); } EXPECT_FALSE(local_storage->Set(ValueStore::DEFAULTS, "WontError", *megabyte) diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index cc3199e..c392e1e 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -578,13 +578,13 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, 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::StringPrintf("%d", NAMESPACE_NOT_DEFINED), + EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED), GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); - EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), + EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED), GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); - EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), + EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED), GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); - EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), + EXPECT_EQ(base::IntToString(NAMESPACE_NOT_DEFINED), GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); } diff --git a/chrome/browser/extensions/extension_notification_observer.cc b/chrome/browser/extensions/extension_notification_observer.cc index 074dbba..29d9ae8 100644 --- a/chrome/browser/extensions/extension_notification_observer.cc +++ b/chrome/browser/extensions/extension_notification_observer.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/logging.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "extensions/common/extension.h" namespace extensions { @@ -24,7 +24,7 @@ std::string Str(const std::vector<extensions::NotificationType>& types) { if (needs_comma) str += ","; needs_comma = true; - str += base::StringPrintf("%d", *it); + str += base::IntToString(*it); } str += "]"; return str; diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index cfa08d9..45debc9 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -11,6 +11,7 @@ #include "base/process/launch.h" #include "base/process/process.h" #include "base/scoped_native_library.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -242,11 +243,11 @@ class AudioRecorder { command_line.AppendArgPath(output_file); command_line.AppendArg("trim"); command_line.AppendArg("0"); - command_line.AppendArg(base::StringPrintf("%d", duration_sec)); + command_line.AppendArg(base::IntToString(duration_sec)); #else command_line.SetProgram(base::FilePath("arecord")); command_line.AppendArg("-d"); - command_line.AppendArg(base::StringPrintf("%d", duration_sec)); + command_line.AppendArg(base::IntToString(duration_sec)); command_line.AppendArg("-f"); command_line.AppendArg("cd"); command_line.AppendArg("-c"); @@ -303,7 +304,7 @@ bool ForceMicrophoneVolumeTo100Percent() { const std::string kHundredPercentVolume = "65536"; base::CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("pacmd"))); command_line.AppendArg("set-source-volume"); - command_line.AppendArg(base::StringPrintf("%d", device_index)); + command_line.AppendArg(base::IntToString(device_index)); command_line.AppendArg(kHundredPercentVolume); DVLOG(0) << "Running " << command_line.GetCommandLineString(); if (!base::GetAppOutput(command_line, &result)) { diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc index 8a1e193..f9caa18 100644 --- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc @@ -171,10 +171,8 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase, converter_command.AppendSwitchPath("--frames_dir", GetWorkingDir()); converter_command.AppendSwitchPath("--output_file", captured_video_filename); - converter_command.AppendSwitchASCII("--width", - base::StringPrintf("%d", width)); - converter_command.AppendSwitchASCII("--height", - base::StringPrintf("%d", height)); + converter_command.AppendSwitchASCII("--width", base::IntToString(width)); + converter_command.AppendSwitchASCII("--height", base::IntToString(height)); converter_command.AppendSwitchASCII("--delete_frames", "true"); // We produce an output file that will later be used as an input to the @@ -244,9 +242,9 @@ class WebRtcVideoQualityBrowserTest : public WebRtcTestBase, compare_command.AppendArg("--frame_analyzer"); compare_command.AppendArgPath(path_to_analyzer); compare_command.AppendArg("--yuv_frame_width"); - compare_command.AppendArg(base::StringPrintf("%d", width)); + compare_command.AppendArg(base::IntToString(width)); compare_command.AppendArg("--yuv_frame_height"); - compare_command.AppendArg(base::StringPrintf("%d", height)); + compare_command.AppendArg(base::IntToString(height)); compare_command.AppendArg("--zxing_path"); compare_command.AppendArgPath(path_to_zxing); compare_command.AppendArg("--ffmpeg_path"); diff --git a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc index cadb88b..912b1e7 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc @@ -7,6 +7,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" @@ -641,7 +642,7 @@ TEST_F(PersistentTabRestoreServiceTest, PruneEntries) { SerializedNavigationEntry navigation = SerializedNavigationEntryTestHelper::CreateNavigation( base::StringPrintf("http://%d", static_cast<int>(i)), - base::StringPrintf("%d", static_cast<int>(i))); + base::SizeTToString(i)); Tab* tab = new Tab(); tab->navigations.push_back(navigation); diff --git a/chrome/browser/ui/app_list/search/history_unittest.cc b/chrome/browser/ui/app_list/search/history_unittest.cc index 4e79170..d5365e6 100644 --- a/chrome/browser/ui/app_list/search/history_unittest.cc +++ b/chrome/browser/ui/app_list/search/history_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/platform_thread.h" #include "chrome/browser/ui/app_list/search/history_factory.h" @@ -241,7 +241,7 @@ TEST_F(SearchHistoryTest, PromoteSecondary) { TEST_F(SearchHistoryTest, MaxPrimary) { for (size_t i = 0; i < kMaxPrimary; ++i) { - std::string query = base::StringPrintf("%d", static_cast<int>(i)); + std::string query = base::SizeTToString(i); history()->AddLaunchEvent(query, "app"); } EXPECT_EQ(kMaxPrimary, associations().size()); @@ -275,7 +275,7 @@ TEST_F(SearchHistoryTest, MaxSecondary) { const char kQuery[] = "query"; history()->AddLaunchEvent(kQuery, "primary"); for (size_t i = 0; i < kMaxSecondary; ++i) { - std::string result_id = base::StringPrintf("%d", static_cast<int>(i)); + std::string result_id = base::SizeTToString(i); history()->AddLaunchEvent(kQuery, result_id); } diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc index bf35824..f5754ce 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.cc +++ b/chrome/browser/ui/webui/gcm_internals_ui.cc @@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/format_macros.h" #include "base/memory/weak_ptr.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" @@ -83,7 +84,7 @@ void SetReceivingInfo( row->AppendDouble(it->time.ToJsTime()); row->AppendString(it->app_id); row->AppendString(it->from); - row->AppendString(base::StringPrintf("%d", it->message_byte_size)); + row->AppendString(base::IntToString(it->message_byte_size)); row->AppendString(it->event); row->AppendString(it->details); } diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc index e1e4c13..89d06b2 100644 --- a/chrome/service/cloud_print/cloud_print_connector.cc +++ b/chrome/service/cloud_print/cloud_print_connector.cc @@ -618,7 +618,7 @@ void CloudPrintConnector::OnReceivePrinterCaps( net::AddMultipartValueForUpload(kPrinterDescValue, info.printer_description, mime_boundary, std::string(), &post_data); net::AddMultipartValueForUpload(kPrinterStatusValue, - base::StringPrintf("%d", info.printer_status), + base::IntToString(info.printer_status), mime_boundary, std::string(), &post_data); // Add local_settings with a current XMPP ping interval. net::AddMultipartValueForUpload(kPrinterLocalSettingsValue, diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index f57ceb6..35a7ccd 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc @@ -11,6 +11,7 @@ #include "base/location.h" #include "base/md5.h" #include "base/metrics/histogram.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" @@ -742,7 +743,7 @@ void PrinterJobHandler::OnReceivePrinterCaps( } if (printer_info.printer_status != printer_info_.printer_status) { net::AddMultipartValueForUpload(kPrinterStatusValue, - base::StringPrintf("%d", printer_info.printer_status), mime_boundary, + base::IntToString(printer_info.printer_status), mime_boundary, std::string(), &post_data); } diff --git a/chrome/test/base/chrome_process_util_mac.cc b/chrome/test/base/chrome_process_util_mac.cc index a4bf316..9073448 100644 --- a/chrome/test/base/chrome_process_util_mac.cc +++ b/chrome/test/base/chrome_process_util_mac.cc @@ -12,7 +12,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" MacChromeProcessInfoList GetRunningMacProcessInfo( const ChromeProcessList& process_list) { @@ -28,7 +27,7 @@ MacChromeProcessInfoList GetRunningMacProcessInfo( process_iter != process_list.end(); ++process_iter) { cmdline.push_back("-p"); - cmdline.push_back(base::StringPrintf("%d", *process_iter)); + cmdline.push_back(base::IntToString(*process_iter)); } // Invoke it diff --git a/chrome/utility/image_writer/image_writer_mac.cc b/chrome/utility/image_writer/image_writer_mac.cc index b2174d2..3bf4b1f 100644 --- a/chrome/utility/image_writer/image_writer_mac.cc +++ b/chrome/utility/image_writer/image_writer_mac.cc @@ -17,7 +17,7 @@ #include "base/posix/eintr_wrapper.h" #include "base/process/kill.h" #include "base/process/launch.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "chrome/common/extensions/image_writer/image_writer_util_mac.h" #include "chrome/utility/image_writer/disk_unmounter_mac.h" @@ -107,7 +107,7 @@ bool ImageWriter::OpenDevice() { } // Build the command line. - std::string rdwr = base::StringPrintf("%d", O_RDWR); + std::string rdwr = base::IntToString(O_RDWR); base::CommandLine cmd_line = base::CommandLine(base::FilePath(kAuthOpenPath)); cmd_line.AppendSwitch("-stdoutpipe"); diff --git a/chromeos/network/geolocation_handler_unittest.cc b/chromeos/network/geolocation_handler_unittest.cc index 97c6ac7..265f120 100644 --- a/chromeos/network/geolocation_handler_unittest.cc +++ b/chromeos/network/geolocation_handler_unittest.cc @@ -4,6 +4,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -48,8 +49,8 @@ class GeolocationHandlerTest : public testing::Test { std::string mac_address = base::StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X", idx, 0, 0, 0, 0, 0); - std::string channel = base::StringPrintf("%d", idx); - std::string strength = base::StringPrintf("%d", idx * 10); + std::string channel = base::IntToString(idx); + std::string strength = base::IntToString(idx * 10); properties.SetStringWithoutPathExpansion( shill::kGeoMacAddressProperty, mac_address); properties.SetStringWithoutPathExpansion( diff --git a/chromeos/network/network_util.cc b/chromeos/network/network_util.cc index 5fa7de5..54a619a 100644 --- a/chromeos/network/network_util.cc +++ b/chromeos/network/network_util.cc @@ -4,9 +4,9 @@ #include "chromeos/network/network_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "chromeos/login/login_state.h" #include "chromeos/network/device_state.h" #include "chromeos/network/managed_network_configuration_handler.h" @@ -54,7 +54,7 @@ std::string PrefixLengthToNetmask(int32 prefix_length) { netmask += "."; int value = remainder == 0 ? 0 : ((2L << (remainder - 1)) - 1) << (8 - remainder); - netmask += base::StringPrintf("%d", value); + netmask += base::IntToString(value); } return netmask; } diff --git a/components/autofill/core/browser/phone_number_i18n.cc b/components/autofill/core/browser/phone_number_i18n.cc index 246c5eb..60cfadd 100644 --- a/components/autofill/core/browser/phone_number_i18n.cc +++ b/components/autofill/core/browser/phone_number_i18n.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "components/autofill/core/browser/autofill_country.h" #include "third_party/libphonenumber/src/phonenumber_api.h" @@ -150,7 +149,7 @@ bool ParsePhoneNumber(const base::string16& value, if (i18n_number->has_country_code() && i18n_number->country_code_source() != PhoneNumber::FROM_DEFAULT_COUNTRY) { *country_code = base::UTF8ToUTF16( - base::StringPrintf("%d", i18n_number->country_code())); + base::IntToString(i18n_number->country_code())); } // The region might be different from what we started with. diff --git a/components/browser_watcher/watcher_client_win_unittest.cc b/components/browser_watcher/watcher_client_win_unittest.cc index 502ba29..4563164 100644 --- a/components/browser_watcher/watcher_client_win_unittest.cc +++ b/components/browser_watcher/watcher_client_win_unittest.cc @@ -4,6 +4,9 @@ #include "components/browser_watcher/watcher_client_win.h" +#include <stdint.h> +#include <stdlib.h> + #include <string> #include "base/base_switches.h" @@ -13,7 +16,6 @@ #include "base/process/kill.h" #include "base/process/process.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" #include "base/test/multiprocess_test.h" #include "base/test/test_reg_util_win.h" #include "base/win/scoped_handle.h" @@ -36,12 +38,12 @@ bool IsValidParentProcessHandle(base::CommandLine& cmd_line, std::string str_handle = cmd_line.GetSwitchValueASCII(switch_name); - unsigned int_handle = 0; - if (!base::StringToUint(str_handle, &int_handle)) + size_t integer_handle = 0; + if (!base::StringToSizeT(str_handle, &integer_handle)) return false; base::ProcessHandle handle = - reinterpret_cast<base::ProcessHandle>(int_handle); + reinterpret_cast<base::ProcessHandle>(integer_handle); // Verify that we can get the associated process id. base::ProcessId parent_id = base::GetProcId(handle); if (parent_id == 0) { @@ -59,6 +61,13 @@ bool IsValidParentProcessHandle(base::CommandLine& cmd_line, return true; } +std::string HandleToString(HANDLE handle) { + // A HANDLE is a void* pointer, which is the same size as a size_t, + // so we can use reinterpret_cast<> on it. + size_t integer_handle = reinterpret_cast<size_t>(handle); + return base::SizeTToString(integer_handle); +} + MULTIPROCESS_TEST_MAIN(VerifyParentHandle) { base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -110,18 +119,15 @@ class WatcherClientTest : public base::MultiProcessTest { base::CommandLine ret = base::GetMultiProcessTestChildBaseCommandLine(); ret.AppendSwitchASCII(switches::kTestChildProcess, "VerifyParentHandle"); - ret.AppendSwitchASCII(kParentHandle, - base::StringPrintf("%d", parent_handle)); + ret.AppendSwitchASCII(kParentHandle, HandleToString(parent_handle)); switch (handle_policy) { case LEAK_HANDLE: - ret.AppendSwitchASCII(kLeakHandle, - base::StringPrintf("%d", self_.Get())); + ret.AppendSwitchASCII(kLeakHandle, HandleToString(self_.Get())); break; case NO_LEAK_HANDLE: - ret.AppendSwitchASCII(kNoLeakHandle, - base::StringPrintf("%d", self_.Get())); + ret.AppendSwitchASCII(kNoLeakHandle, HandleToString(self_.Get())); break; default: diff --git a/components/crash/app/crashpad_mac.mm b/components/crash/app/crashpad_mac.mm index 962cce6..e174213 100644 --- a/components/crash/app/crashpad_mac.mm +++ b/components/crash/app/crashpad_mac.mm @@ -18,6 +18,7 @@ #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" @@ -164,7 +165,7 @@ void InitializeCrashpad(const std::string& process_type) { SetCrashKeyValue("ptype", browser_process ? base::StringPiece("browser") : base::StringPiece(process_type)); - SetCrashKeyValue("pid", base::StringPrintf("%d", getpid())); + SetCrashKeyValue("pid", base::IntToString(getpid())); logging::SetLogMessageHandler(LogMessageHandler); diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc index 38c1ea3..a5d1744 100644 --- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/message_loop/message_loop.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -46,8 +47,8 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test { std::string mac_address = base::StringPrintf("%02X:%02X:%02X:%02X:%02X:%02X", i, j, 3, 4, 5, 6); - std::string channel = base::StringPrintf("%d", i * 10 + j); - std::string strength = base::StringPrintf("%d", i * 100 + j); + std::string channel = base::IntToString(i * 10 + j); + std::string strength = base::IntToString(i * 100 + j); properties.SetStringWithoutPathExpansion( shill::kGeoMacAddressProperty, mac_address); properties.SetStringWithoutPathExpansion( diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index 06c7ba9..3256cb3 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -12,6 +12,7 @@ #include "base/metrics/histogram.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_offset_string_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -3196,8 +3197,8 @@ void PepperPluginInstanceImpl::SetSizeAttributesForFullscreen() { return; blink::WebScreenInfo info = render_frame_->GetRenderWidget()->screenInfo(); screen_size_for_fullscreen_ = gfx::Size(info.rect.width, info.rect.height); - std::string width = StringPrintf("%d", screen_size_for_fullscreen_.width()); - std::string height = StringPrintf("%d", screen_size_for_fullscreen_.height()); + std::string width = base::IntToString(screen_size_for_fullscreen_.width()); + std::string height = base::IntToString(screen_size_for_fullscreen_.height()); WebElement element = container_->element(); element.setAttribute(WebString::fromUTF8(kWidth), WebString::fromUTF8(width)); diff --git a/courgette/memory_monitor.cc b/courgette/memory_monitor.cc index e592e873..2769cdc 100644 --- a/courgette/memory_monitor.cc +++ b/courgette/memory_monitor.cc @@ -26,7 +26,7 @@ struct H { if (s > 1000000000) return base::StringPrintf("%.3gG", s/(1000000000.0)); if (s > 1000000) return base::StringPrintf("%.3gM", s/(1000000.)); if (s > 9999) return base::StringPrintf("%.3gk", s/(1000.)); - return base::StringPrintf("%d", (int)s); + return base::IntToString((int)s); } void tick(size_t w, char sign) { diff --git a/dbus/message.cc b/dbus/message.cc index ddcf85f..3b021e5 100644 --- a/dbus/message.cc +++ b/dbus/message.cc @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/format_macros.h" #include "base/logging.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "dbus/object_path.h" @@ -101,7 +102,7 @@ std::string Message::ToStringInternal(const std::string& indent, uint8 value = 0; if (!reader->PopByte(&value)) return kBrokenMessage; - output += indent + "byte " + base::StringPrintf("%d", value) + "\n"; + output += indent + "byte " + base::IntToString(value) + "\n"; break; } case BOOL: { @@ -115,21 +116,21 @@ std::string Message::ToStringInternal(const std::string& indent, int16 value = 0; if (!reader->PopInt16(&value)) return kBrokenMessage; - output += indent + "int16 " + base::StringPrintf("%d", value) + "\n"; + output += indent + "int16 " + base::IntToString(value) + "\n"; break; } case UINT16: { uint16 value = 0; if (!reader->PopUint16(&value)) return kBrokenMessage; - output += indent + "uint16 " + base::StringPrintf("%d", value) + "\n"; + output += indent + "uint16 " + base::IntToString(value) + "\n"; break; } case INT32: { int32 value = 0; if (!reader->PopInt32(&value)) return kBrokenMessage; - output += indent + "int32 " + base::StringPrintf("%d", value) + "\n"; + output += indent + "int32 " + base::IntToString(value) + "\n"; break; } case UINT32: { @@ -228,7 +229,7 @@ std::string Message::ToStringInternal(const std::string& indent, if (!reader->PopFileDescriptor(&file_descriptor)) return kBrokenMessage; output += indent + "fd#" + - base::StringPrintf("%d", file_descriptor.value()) + "\n"; + base::IntToString(file_descriptor.value()) + "\n"; break; } default: diff --git a/extensions/browser/api/storage/storage_frontend_unittest.cc b/extensions/browser/api/storage/storage_frontend_unittest.cc index 75982ea..64515d0 100644 --- a/extensions/browser/api/storage/storage_frontend_unittest.cc +++ b/extensions/browser/api/storage/storage_frontend_unittest.cc @@ -7,7 +7,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "content/public/browser/browser_context.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread.h" @@ -195,14 +195,14 @@ TEST_F(ExtensionSettingsFrontendTest, // Sync storage should run out after ~100K. scoped_ptr<base::Value> kilobyte = util::CreateKilobyte(); for (int i = 0; i < 100; ++i) { - sync_storage->Set(DEFAULTS, base::StringPrintf("%d", i), *kilobyte); + sync_storage->Set(DEFAULTS, base::IntToString(i), *kilobyte); } EXPECT_TRUE(sync_storage->Set(DEFAULTS, "WillError", *kilobyte)->HasError()); // Local storage shouldn't run out after ~100K. for (int i = 0; i < 100; ++i) { - local_storage->Set(DEFAULTS, base::StringPrintf("%d", i), *kilobyte); + local_storage->Set(DEFAULTS, base::IntToString(i), *kilobyte); } EXPECT_FALSE( @@ -211,7 +211,7 @@ TEST_F(ExtensionSettingsFrontendTest, // Local storage should run out after ~5MB. scoped_ptr<base::Value> megabyte = util::CreateMegabyte(); for (int i = 0; i < 5; ++i) { - local_storage->Set(DEFAULTS, base::StringPrintf("%d", i), *megabyte); + local_storage->Set(DEFAULTS, base::IntToString(i), *megabyte); } EXPECT_TRUE(local_storage->Set(DEFAULTS, "WillError", *megabyte)->HasError()); diff --git a/gpu/command_buffer/service/error_state.cc b/gpu/command_buffer/service/error_state.cc index ca4af85..6667e1d 100644 --- a/gpu/command_buffer/service/error_state.cc +++ b/gpu/command_buffer/service/error_state.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/logger.h" @@ -170,7 +171,7 @@ void ErrorStateImpl::SetGLErrorInvalidParami( filename, line, error, function_name, (std::string("trying to set ") + GLES2Util::GetStringEnum(pname) + " to " + - base::StringPrintf("%d", param)).c_str()); + base::IntToString(param)).c_str()); } } diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc index 2403340..8ef3d3ca 100644 --- a/gpu/config/gpu_info_collector.cc +++ b/gpu/config/gpu_info_collector.cc @@ -12,7 +12,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" -#include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_context.h" @@ -104,7 +103,7 @@ CollectInfoResult CollectGraphicsInfoGL(GPUInfo* gpu_info) { std::string glsl_version_string = GetGLString(GL_SHADING_LANGUAGE_VERSION); GLint max_samples = 0; glGetIntegerv(GL_MAX_SAMPLES, &max_samples); - gpu_info->max_msaa_samples = base::StringPrintf("%d", max_samples); + gpu_info->max_msaa_samples = base::IntToString(max_samples); gfx::GLWindowSystemBindingInfo window_system_binding_info; if (GetGLWindowSystemBindingInfo(&window_system_binding_info)) { diff --git a/gpu/config/gpu_info_collector_android.cc b/gpu/config/gpu_info_collector_android.cc index ce14f03..93da6a9 100644 --- a/gpu/config/gpu_info_collector_android.cc +++ b/gpu/config/gpu_info_collector_android.cc @@ -203,7 +203,7 @@ gpu::CollectInfoResult CollectDriverInfo(gpu::GPUInfo* gpu_info) { GLint max_samples = 0; glGetIntegervFn(GL_MAX_SAMPLES, &max_samples); - gpu_info->max_msaa_samples = base::StringPrintf("%d", max_samples); + gpu_info->max_msaa_samples = base::IntToString(max_samples); bool supports_robustness = gpu_info->gl_extensions.find("GL_EXT_robustness") != std::string::npos || diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc index 5133ea5..78bfa42 100644 --- a/net/disk_cache/blockfile/backend_impl.cc +++ b/net/disk_cache/blockfile/backend_impl.cc @@ -15,6 +15,7 @@ #include "base/metrics/histogram.h" #include "base/rand_util.h" #include "base/single_thread_task_runner.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" @@ -1289,19 +1290,19 @@ void BackendImpl::GetStats(StatsItems* stats) { std::pair<std::string, std::string> item; item.first = "Entries"; - item.second = base::StringPrintf("%d", data_->header.num_entries); + item.second = base::IntToString(data_->header.num_entries); stats->push_back(item); item.first = "Pending IO"; - item.second = base::StringPrintf("%d", num_pending_io_); + item.second = base::IntToString(num_pending_io_); stats->push_back(item); item.first = "Max size"; - item.second = base::StringPrintf("%d", max_size_); + item.second = base::IntToString(max_size_); stats->push_back(item); item.first = "Current size"; - item.second = base::StringPrintf("%d", data_->header.num_bytes); + item.second = base::IntToString(data_->header.num_bytes); stats->push_back(item); item.first = "Cache type"; diff --git a/net/disk_cache/blockfile/backend_impl_v3.cc b/net/disk_cache/blockfile/backend_impl_v3.cc index 56804bc..36402510 100644 --- a/net/disk_cache/blockfile/backend_impl_v3.cc +++ b/net/disk_cache/blockfile/backend_impl_v3.cc @@ -12,6 +12,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" #include "base/rand_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" @@ -690,19 +691,19 @@ void BackendImplV3::GetStats(StatsItems* stats) { std::pair<std::string, std::string> item; item.first = "Entries"; - item.second = base::StringPrintf("%d", data_->header.num_entries); + item.second = base::IntToString(data_->header.num_entries); stats->push_back(item); item.first = "Pending IO"; - item.second = base::StringPrintf("%d", num_pending_io_); + item.second = base::IntToString(num_pending_io_); stats->push_back(item); item.first = "Max size"; - item.second = base::StringPrintf("%d", max_size_); + item.second = base::IntToString(max_size_); stats->push_back(item); item.first = "Current size"; - item.second = base::StringPrintf("%d", data_->header.num_bytes); + item.second = base::IntToString(data_->header.num_bytes); stats->push_back(item); item.first = "Cache type"; diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index f16cbda..c7b3ff1 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -7,8 +7,8 @@ #include "base/bind_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" @@ -3380,7 +3380,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheEvictOldEntries) { // will be checked for outliving the eviction. AddDelay(); } - ASSERT_EQ(net::OK, CreateEntry(key2 + base::StringPrintf("%d", i), &entry)); + ASSERT_EQ(net::OK, CreateEntry(key2 + base::IntToString(i), &entry)); ScopedEntryPtr entry_closer(entry); EXPECT_EQ(kWriteSize, WriteData(entry, 1, 0, buffer.get(), kWriteSize, false)); @@ -3395,8 +3395,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheEvictOldEntries) { // Generally there is no guarantee that at this point the backround eviction // is finished. We are testing the positive case, i.e. when the eviction // never reaches this entry, should be non-flaky. - ASSERT_EQ(net::OK, OpenEntry(key2 + base::StringPrintf("%d", entry_no), - &entry)) + ASSERT_EQ(net::OK, OpenEntry(key2 + base::IntToString(entry_no), &entry)) << "Should not have evicted fresh entry " << entry_no; entry->Close(); } diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index a3375e3..529e1ef 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -20,7 +20,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" #include "base/time/time.h" #include "build/build_config.h" #include "sync/engine/backoff_delay_provider.h" @@ -2817,7 +2816,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_Success) { { WriteTransaction trans(FROM_HERE, UNITTEST, directory()); for (uint32 i = 0; i < items_to_commit; i++) { - string nameutf8 = base::StringPrintf("%d", i); + string nameutf8 = base::UintToString(i); string name(nameutf8.begin(), nameutf8.end()); MutableEntry e(&trans, CREATE, BOOKMARKS, trans.root_id(), name); e.PutIsUnsynced(true); @@ -2840,7 +2839,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_PostBufferFail) { { WriteTransaction trans(FROM_HERE, UNITTEST, directory()); for (uint32 i = 0; i < items_to_commit; i++) { - string nameutf8 = base::StringPrintf("%d", i); + string nameutf8 = base::UintToString(i); string name(nameutf8.begin(), nameutf8.end()); MutableEntry e(&trans, CREATE, BOOKMARKS, trans.root_id(), name); e.PutIsUnsynced(true); @@ -2870,7 +2869,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_CommitConflict) { { WriteTransaction trans(FROM_HERE, UNITTEST, directory()); for (uint32 i = 0; i < items_to_commit; i++) { - string nameutf8 = base::StringPrintf("%d", i); + string nameutf8 = base::UintToString(i); string name(nameutf8.begin(), nameutf8.end()); MutableEntry e(&trans, CREATE, BOOKMARKS, trans.root_id(), name); e.PutIsUnsynced(true); diff --git a/ui/app_list/pagination_model_unittest.cc b/ui/app_list/pagination_model_unittest.cc index c6b2922..63d8ab0 100644 --- a/ui/app_list/pagination_model_unittest.cc +++ b/ui/app_list/pagination_model_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" -#include "base/strings/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/pagination_model_observer.h" @@ -57,7 +57,7 @@ class TestPaginationModelObserver : public PaginationModelObserver { void AppendSelectedPage(int page) { if (selected_pages_.length()) selected_pages_.append(std::string(" ")); - selected_pages_.append(base::StringPrintf("%d", page)); + selected_pages_.append(base::IntToString(page)); } // PaginationModelObserver overrides: |