| Index: chrome/browser/importer/nss_decryptor_win.h
|
| diff --git a/chrome/browser/importer/nss_decryptor_win.h b/chrome/browser/importer/nss_decryptor_win.h
|
| index 5fea1a942d40a3b55f979d393026db1df22793bd..1aeb266d65406a08cace3ddba2d0d6c2db5066a9 100644
|
| --- a/chrome/browser/importer/nss_decryptor_win.h
|
| +++ b/chrome/browser/importer/nss_decryptor_win.h
|
| @@ -104,11 +104,9 @@ typedef void (*SECITEMFreeItemFunc)(SECItem *item, PRBool free_it);
|
| typedef void (*PLArenaFinishFunc)(void);
|
| typedef PRStatus (*PRCleanupFunc)(void);
|
|
|
| -namespace webkit {
|
| -namespace forms {
|
| +namespace content {
|
| struct PasswordForm;
|
| }
|
| -}
|
|
|
| // A wrapper for Firefox NSS decrypt component.
|
| class NSSDecryptor {
|
| @@ -132,13 +130,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<webkit::forms::PasswordForm>* forms);
|
| + std::vector<content::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 FilePath& sqlite_file,
|
| - std::vector<webkit::forms::PasswordForm>* forms);
|
| + std::vector<content::PasswordForm>* forms);
|
|
|
| private:
|
| // Call NSS initialization funcs.
|
|
|