| Index: chrome/utility/importer/nss_decryptor.cc
|
| diff --git a/chrome/utility/importer/nss_decryptor.cc b/chrome/utility/importer/nss_decryptor.cc
|
| index a06f2085dfb39a55c39bad6e7ee19b0d88a56c3c..652fed7f9dcfc1b79eb0d6efd76879282b493ef4 100644
|
| --- a/chrome/utility/importer/nss_decryptor.cc
|
| +++ b/chrome/utility/importer/nss_decryptor.cc
|
| @@ -61,10 +61,10 @@
|
| *
|
| * ***** END LICENSE BLOCK ***** */
|
|
|
| -string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
|
| +base::string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
|
| // Do nothing if NSS is not loaded.
|
| if (!is_nss_initialized_)
|
| - return string16();
|
| + return base::string16();
|
|
|
| // The old style password is encoded in base64. They are identified
|
| // by a leading '~'. Otherwise, we should decrypt the text.
|
| @@ -76,7 +76,7 @@ string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
|
| SECStatus result = PK11_Authenticate(slot, PR_TRUE, NULL);
|
| if (result != SECSuccess) {
|
| FreeSlot(slot);
|
| - return string16();
|
| + return base::string16();
|
| }
|
|
|
| SECItem request;
|
|
|