| Index: components/webdata/encryptor/encryptor_posix.cc
|
| diff --git a/components/webdata/encryptor/encryptor_posix.cc b/components/webdata/encryptor/encryptor_posix.cc
|
| index 70d536c146fb673bb29710cc1281acffafdb4042..ef730a41a659298272e505b81db8f9338a611739 100644
|
| --- a/components/webdata/encryptor/encryptor_posix.cc
|
| +++ b/components/webdata/encryptor/encryptor_posix.cc
|
| @@ -54,13 +54,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;
|
|
|