Linux: Fix NSSDecryptor to import Firefox passwords from the user database correctly.

chrome/browser/importer/firefox_importer_unittest.cc

Index: chrome/browser/importer/firefox_importer_unittest.cc
diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc
index 38d3073b90a6bb7ec3962345b557535229f0da89..4766a9de0ca29895a6125e5dc1df3c51fa5ff211 100644
--- a/chrome/browser/importer/firefox_importer_unittest.cc
+++ b/chrome/browser/importer/firefox_importer_unittest.cc
@@ -9,10 +9,8 @@
 #include "base/path_service.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
-#include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/test/file_test_utils.h"
 
 using base::Time;
 
@@ -153,79 +151,3 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
   EXPECT_EQ(L"", post_data);
   EXPECT_TRUE(Time() == add_date);
 }
-
-// Tests basic functionality and verifies that the lock file is deleted after
-// use.
-TEST(FirefoxImporterTest, ProfileLock) {
-  std::wstring test_path;
-  file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
-  FilePath lock_file_path = FilePath::FromWStringHack(test_path);
-  FileAutoDeleter deleter(lock_file_path);
-  lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
-
-  scoped_ptr<FirefoxProfileLock> lock;
-  EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
-  EXPECT_FALSE(file_util::PathExists(lock_file_path));
-  lock.reset(new FirefoxProfileLock(test_path));
-  EXPECT_TRUE(lock->HasAcquired());
-  EXPECT_TRUE(file_util::PathExists(lock_file_path));
-  lock->Unlock();
-  EXPECT_FALSE(lock->HasAcquired());
-  EXPECT_FALSE(file_util::PathExists(lock_file_path));
-  lock->Lock();
-  EXPECT_TRUE(lock->HasAcquired());
-  EXPECT_TRUE(file_util::PathExists(lock_file_path));
-  lock->Lock();
-  EXPECT_TRUE(lock->HasAcquired());
-  lock->Unlock();
-  EXPECT_FALSE(lock->HasAcquired());
-  EXPECT_FALSE(file_util::PathExists(lock_file_path));
-}
-
-// If for some reason the lock file is left behind by the previous owner, we
-// should still be able to lock it, at least in the Windows implementation.
-TEST(FirefoxImporterTest, ProfileLockOrphaned) {
-  std::wstring test_path;
-  file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
-  FilePath lock_file_path = FilePath::FromWStringHack(test_path);
-  FileAutoDeleter deleter(lock_file_path);
-  lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
-
-  // Create the orphaned lock file.
-  FILE* lock_file = file_util::OpenFile(lock_file_path, "w");
-  ASSERT_TRUE(lock_file);
-  file_util::CloseFile(lock_file);
-  EXPECT_TRUE(file_util::PathExists(lock_file_path));
-
-  scoped_ptr<FirefoxProfileLock> lock;
-  EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
-  lock.reset(new FirefoxProfileLock(test_path));
-  EXPECT_TRUE(lock->HasAcquired());
-  lock->Unlock();
-  EXPECT_FALSE(lock->HasAcquired());
-}
-
-// Tests two locks contending for the same lock file.
-TEST(FirefoxImporterTest, ProfileLockContention) {
-  std::wstring test_path;
-  file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
-  FileAutoDeleter deleter(FilePath::FromWStringHack(test_path));
-
-  scoped_ptr<FirefoxProfileLock> lock1;
-  EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock1.get());
-  lock1.reset(new FirefoxProfileLock(test_path));
-  EXPECT_TRUE(lock1->HasAcquired());
-
-  scoped_ptr<FirefoxProfileLock> lock2;
-  EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock2.get());
-  lock2.reset(new FirefoxProfileLock(test_path));
-  EXPECT_FALSE(lock2->HasAcquired());
-
-  lock1->Unlock();
-  EXPECT_FALSE(lock1->HasAcquired());
-
-  lock2->Lock();
-  EXPECT_TRUE(lock2->HasAcquired());
-  lock2->Unlock();
-  EXPECT_FALSE(lock2->HasAcquired());
-}