| Index: chrome/utility/importer/nss_decryptor_mac.h
|
| diff --git a/chrome/utility/importer/nss_decryptor_mac.h b/chrome/utility/importer/nss_decryptor_mac.h
|
| index eb902a1992f22cab5cfd77e22f8874d468682cdc..88fbad245b7fee5a312f1bad3a651322ffd3d1dd 100644
|
| --- a/chrome/utility/importer/nss_decryptor_mac.h
|
| +++ b/chrome/utility/importer/nss_decryptor_mac.h
|
| @@ -107,7 +107,7 @@ typedef void (*SECITEMFreeItemFunc)(SECItem *item, PRBool free_it);
|
| typedef void (*PLArenaFinishFunc)(void);
|
| typedef PRStatus (*PRCleanupFunc)(void);
|
|
|
| -namespace content {
|
| +namespace autofill {
|
| struct PasswordForm;
|
| }
|
|
|
| @@ -132,13 +132,13 @@ class NSSDecryptor {
|
| // username/password and reads other related information.
|
| // The result will be stored in |forms|.
|
| void ParseSignons(const std::string& content,
|
| - std::vector<content::PasswordForm>* forms);
|
| + std::vector<autofill::PasswordForm>* forms);
|
|
|
| // Reads and parses the Firefox password sqlite db, decrypts the
|
| // username/password and reads other related information.
|
| // The result will be stored in |forms|.
|
| bool ReadAndParseSignons(const base::FilePath& sqlite_file,
|
| - std::vector<content::PasswordForm>* forms);
|
| + std::vector<autofill::PasswordForm>* forms);
|
| private:
|
| PK11SlotInfo* GetKeySlotForDB() const { return PK11_GetInternalKeySlot(); }
|
| void FreeSlot(PK11SlotInfo* slot) const { PK11_FreeSlot(slot); }
|
|
|