Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Unified Diff: components/webdata/encryptor/encryptor_mac.mm

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/webdata/encryptor/encryptor_mac.mm
diff --git a/components/webdata/encryptor/encryptor_mac.mm b/components/webdata/encryptor/encryptor_mac.mm
index 089bf6c96f59572eb321b71e7f7e7607a2d1862b..de384db260458db7b7ab4d419343200849f31e7d 100644
--- a/components/webdata/encryptor/encryptor_mac.mm
+++ b/components/webdata/encryptor/encryptor_mac.mm
@@ -71,7 +71,7 @@ crypto::SymmetricKey* GetEncryptionKey() {
bool Encryptor::EncryptString16(const base::string16& plaintext,
std::string* ciphertext) {
- return EncryptString(UTF16ToUTF8(plaintext), ciphertext);
+ return EncryptString(base::UTF16ToUTF8(plaintext), ciphertext);
}
bool Encryptor::DecryptString16(const std::string& ciphertext,
@@ -80,7 +80,7 @@ bool Encryptor::DecryptString16(const std::string& ciphertext,
if (!DecryptString(ciphertext, &utf8))
return false;
- *plaintext = UTF8ToUTF16(utf8);
+ *plaintext = base::UTF8ToUTF16(utf8);
return true;
}
« no previous file with comments | « components/webdata/common/web_database_migration_unittest.cc ('k') | components/webdata/encryptor/encryptor_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698