diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 01:46:32 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 01:46:32 +0000 |
| commit | f161478983b46c9c9a2acc855f9148ea7872d51b (patch) | |
| tree | 72620cfa70e563024ef80ec3e08a531ca1b30501 /chrome/browser/importer/firefox_profile_lock.h | |
| parent | b82d98b9be4c2081bdd19adf4f2cbe4469e2dd20 (diff) | |
| download | chromium_src-f161478983b46c9c9a2acc855f9148ea7872d51b.zip chromium_src-f161478983b46c9c9a2acc855f9148ea7872d51b.tar.gz chromium_src-f161478983b46c9c9a2acc855f9148ea7872d51b.tar.bz2 | |
Linux: Fix NSSDecryptor to decrypt Firefox passwords using correct user database.
Note that we're deliberately leaving NSS user databases open until NSS shutdown since closing and reopening it does not work correctly (NSS bug).
Also, enable the firefox_importer_unittest.cc for linux. Move out some tests to firefox_profile_unittest.cc.
Fix lock file deletion in the posix implementation of FirefoxProfileLock.
BUG=http://crbug.com/17490
TEST=Import bookmark and settings, verify that passwords are indeed imported.
Review URL: http://codereview.chromium.org/160077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox_profile_lock.h')
| -rw-r--r-- | chrome/browser/importer/firefox_profile_lock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h index 1c1c7ee..d04fc35 100644 --- a/chrome/browser/importer/firefox_profile_lock.h +++ b/chrome/browser/importer/firefox_profile_lock.h @@ -80,8 +80,8 @@ class FirefoxProfileLock { bool HasAcquired(); private: - FRIEND_TEST(FirefoxImporterTest, ProfileLock); - FRIEND_TEST(FirefoxImporterTest, ProfileLockOrphaned); + FRIEND_TEST(FirefoxProfileLockTest, ProfileLock); + FRIEND_TEST(FirefoxProfileLockTest, ProfileLockOrphaned); static const FilePath::CharType* kLockFileName; static const FilePath::CharType* kOldLockFileName; @@ -103,7 +103,7 @@ class FirefoxProfileLock { FilePath old_lock_file_; // Method that tries to put a fcntl lock on file specified by |lock_file_|. - // Returns false if lock is already help by another process. true in all + // Returns false if lock is already held by another process. true in all // other cases. bool LockWithFcntl(); #endif |