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

chrome/browser/importer/firefox_profile_lock.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__
 #define CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 62 matching lines @@
   ~FirefoxProfileLock();
 
   // Locks and releases the profile.
   void Lock();
   void Unlock();
 
   // Returns true if we lock the profile successfully.
   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;
 
   void Init();
 
   // Full path of the lock file in the profile folder.
   FilePath lock_file_;
 
   // The handle of the lock file.
 #if defined(OS_WIN)
   HANDLE lock_handle_;
 #elif defined(OS_POSIX)
   int lock_fd_;
 
   // On Posix systems Firefox apparently first tries to put a fcntl lock
   // on a file and if that fails, it does a regular exculsive open on another
   // file. This variable contains the location of this other file.
   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
 
   DISALLOW_COPY_AND_ASSIGN(FirefoxProfileLock);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_FIREFOX_PROFILE_LOCK_H__