| Index: chrome/browser/importer/nss_decryptor_system_nss.h
|
| diff --git a/chrome/browser/importer/nss_decryptor_system_nss.h b/chrome/browser/importer/nss_decryptor_system_nss.h
|
| index e055fa971bba71ee723da27a07a8b2cf163b3ac9..c125da964c252c86576a8a548ae9d2612fdc410f 100644
|
| --- a/chrome/browser/importer/nss_decryptor_system_nss.h
|
| +++ b/chrome/browser/importer/nss_decryptor_system_nss.h
|
| @@ -14,11 +14,9 @@
|
|
|
| class FilePath;
|
|
|
| -namespace webkit {
|
| -namespace forms {
|
| +namespace content {
|
| struct PasswordForm;
|
| }
|
| -}
|
|
|
| // A wrapper for Firefox NSS decrypt component.
|
| class NSSDecryptor {
|
| @@ -37,13 +35,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:
|
| // Does not actually free the slot, since we'll free it when NSSDecryptor is
|
| // destroyed.
|
|
|