diff options
Diffstat (limited to 'chrome/browser/password_manager')
4 files changed, 15 insertions, 9 deletions
diff --git a/chrome/browser/password_manager/ie7_password.cc b/chrome/browser/password_manager/ie7_password.cc index 576194b..ba15900 100644 --- a/chrome/browser/password_manager/ie7_password.cc +++ b/chrome/browser/password_manager/ie7_password.cc @@ -11,6 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/string_util.h" +#include "base/stringprintf.h" namespace { @@ -100,9 +101,9 @@ std::wstring GetUrlHash(const std::wstring& url) { // check_sum. unsigned char hash_byte = static_cast<unsigned char>(hash_bin[i]); checksum += hash_byte; - url_hash += StringPrintf(L"%2.2X", static_cast<unsigned>(hash_byte)); + url_hash += base::StringPrintf(L"%2.2X", static_cast<unsigned>(hash_byte)); } - url_hash += StringPrintf(L"%2.2X", checksum); + url_hash += base::StringPrintf(L"%2.2X", checksum); return url_hash; } 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 7a91756..352aa92 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" @@ -102,8 +103,9 @@ gpointer mock_gnome_keyring_store_password( mock_keyring_items.push_back( MockKeyringItem(keyring, display_name, password)); MockKeyringItem* item = &mock_keyring_items.back(); - const std::string keyring_desc = keyring ? StringPrintf("keyring %s", keyring) - : std::string("default keyring"); + const std::string keyring_desc = + keyring ? base::StringPrintf("keyring %s", keyring) + : std::string("default keyring"); VLOG(1) << "Adding item with origin " << display_name << " to " << keyring_desc; va_list ap; diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 064cb33..ffbd55b 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/pickle.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "content/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" @@ -650,7 +650,7 @@ int NativeBackendKWallet::WalletHandle() { std::string NativeBackendKWallet::GetProfileSpecificFolderName() const { // Originally, the folder name was always just "Chrome Form Data". // Now we use it to distinguish passwords for different profiles. - return StringPrintf("%s (%d)", kKWalletFolder, profile_id_); + return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_); } void NativeBackendKWallet::MigrateToProfileSpecificLogins() { diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 4ab880b..bb09d4e 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -8,6 +8,7 @@ #include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -245,9 +246,11 @@ class LoginDatabaseQueryTask : public Task { void InitExpectedForms(bool autofillable, size_t count, VectorOfForms* forms) { const char* domain = autofillable ? "example" : "blacklisted"; for (size_t i = 0; i < count; ++i) { - std::string realm = StringPrintf("http://%zu.%s.com", i, domain); - std::string origin = StringPrintf("http://%zu.%s.com/origin", i, domain); - std::string action = StringPrintf("http://%zu.%s.com/action", i, domain); + std::string realm = base::StringPrintf("http://%zu.%s.com", i, domain); + std::string origin = base::StringPrintf("http://%zu.%s.com/origin", + i, domain); + std::string action = base::StringPrintf("http://%zu.%s.com/action", + i, domain); PasswordFormData data = { PasswordForm::SCHEME_HTML, realm.c_str(), |