| Index: components/webdata/encryptor/encryptor_mac.mm
|
| diff --git a/components/webdata/encryptor/encryptor_mac.mm b/components/webdata/encryptor/encryptor_mac.mm
|
| index 67c463136b558c3db1494b1e5e948e34aec8ea3b..e402578d59435eaf71f8ec6719eb61483e7ae436 100644
|
| --- a/components/webdata/encryptor/encryptor_mac.mm
|
| +++ b/components/webdata/encryptor/encryptor_mac.mm
|
| @@ -69,13 +69,13 @@ crypto::SymmetricKey* GetEncryptionKey() {
|
|
|
| } // namespace
|
|
|
| -bool Encryptor::EncryptString16(const string16& plaintext,
|
| +bool Encryptor::EncryptString16(const base::string16& plaintext,
|
| std::string* ciphertext) {
|
| return EncryptString(UTF16ToUTF8(plaintext), ciphertext);
|
| }
|
|
|
| bool Encryptor::DecryptString16(const std::string& ciphertext,
|
| - string16* plaintext) {
|
| + base::string16* plaintext) {
|
| std::string utf8;
|
| if (!DecryptString(ciphertext, &utf8))
|
| return false;
|
|
|