| Index: chrome/browser/importer/nss_decryptor_mac.h
|
| diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h
|
| index b540fe9942fef65960bd12d716d7761e61c9a1f6..46933ccf9d237633409d2ea104cd69d7fc979ad8 100644
|
| --- a/chrome/browser/importer/nss_decryptor_mac.h
|
| +++ b/chrome/browser/importer/nss_decryptor_mac.h
|
| @@ -119,12 +119,7 @@ class NSSDecryptor {
|
|
|
| // Initializes NSS if it hasn't already been initialized.
|
| bool Init(const std::wstring& /* dll_path */,
|
| - const std::wstring& /* db_path */) {
|
| - // TODO(port): Load the NSS libraries and call InitNSS()
|
| - // http://code.google.com/p/chromium/issues/detail?id=15455
|
| - NOTIMPLEMENTED();
|
| - return false;
|
| - }
|
| + const std::wstring& /* db_path */);
|
|
|
| // Decrypts Firefox stored passwords. Before using this method,
|
| // make sure Init() returns true.
|
| @@ -152,6 +147,12 @@ class NSSDecryptor {
|
| PLArenaFinishFunc PL_ArenaFinish;
|
| PRCleanupFunc PR_Cleanup;
|
|
|
| + // Libraries necessary for decrypting the passwords.
|
| + static const wchar_t kNSS3Library[];
|
| + static const wchar_t kSoftokn3Library[];
|
| + static const wchar_t kPLDS4Library[];
|
| + static const wchar_t kNSPR4Library[];
|
| +
|
| // True if NSS_Init() has been called
|
| bool is_nss_initialized_;
|
|
|
|
|