| Index: chrome/utility/importer/nss_decryptor_system_nss.h
|
| diff --git a/chrome/utility/importer/nss_decryptor_system_nss.h b/chrome/utility/importer/nss_decryptor_system_nss.h
|
| index 3cdaa362c498896212e47b1edcd118c7969a98ca..412fe9478e0932dd377f805bca4c4f4c751a7c2a 100644
|
| --- a/chrome/utility/importer/nss_decryptor_system_nss.h
|
| +++ b/chrome/utility/importer/nss_decryptor_system_nss.h
|
| @@ -12,12 +12,12 @@
|
| #include "base/basictypes.h"
|
| #include "base/strings/string16.h"
|
|
|
| -namespace base {
|
| -class FilePath;
|
| +namespace autofill {
|
| +struct PasswordForm;
|
| }
|
|
|
| -namespace content {
|
| -struct PasswordForm;
|
| +namespace base {
|
| +class FilePath;
|
| }
|
|
|
| // A wrapper for Firefox NSS decrypt component.
|
| @@ -37,13 +37,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:
|
| // Does not actually free the slot, since we'll free it when NSSDecryptor is
|
| // destroyed.
|
|
|