| Index: chrome/utility/importer/nss_decryptor_null.h
|
| diff --git a/chrome/utility/importer/nss_decryptor_null.h b/chrome/utility/importer/nss_decryptor_null.h
|
| index 82744e6fa58dd16e008dfd81dc4c52c3712ea603..e99334badf09c7b88ec98dcaa082b97cc45a178d 100644
|
| --- a/chrome/utility/importer/nss_decryptor_null.h
|
| +++ b/chrome/utility/importer/nss_decryptor_null.h
|
| @@ -27,7 +27,9 @@ class NSSDecryptor {
|
| bool Init(const base::FilePath& dll_path, const base::FilePath& db_path) {
|
| return false;
|
| }
|
| - string16 Decrypt(const std::string& crypt) const { return string16(); }
|
| + base::string16 Decrypt(const std::string& crypt) const {
|
| + return base::string16();
|
| + }
|
| void ParseSignons(const std::string& content,
|
| std::vector<autofill::PasswordForm>* forms) {}
|
| bool ReadAndParseSignons(const base::FilePath& sqlite_file,
|
|
|