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

chrome/browser/importer/nss_decryptor.cc

 // 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.
 
 #include "chrome/browser/importer/nss_decryptor.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_LINUX)
 #include <pk11pub.h>
@@ skipping 50 matching lines @@
   // Do nothing if NSS is not loaded.
   if (!is_nss_initialized_)
     return std::wstring();
 
   // The old style password is encoded in base64. They are identified
   // by a leading '~'. Otherwise, we should decrypt the text.
   std::string plain;
   if (crypt[0] != '~') {
     std::string decoded_data;
     net::Base64Decode(crypt, &decoded_data);
-    PK11SlotInfo* slot = NULL;
-    slot = PK11_GetInternalKeySlot();
+    PK11SlotInfo* slot = GetKeySlotForDB();
     SECStatus result = PK11_Authenticate(slot, PR_TRUE, NULL);
     if (result != SECSuccess) {
-      PK11_FreeSlot(slot);
+      FreeSlot(slot);
       return std::wstring();
     }
 
     SECItem request;
     request.data = reinterpret_cast<unsigned char*>(
         const_cast<char*>(decoded_data.data()));
     request.len = static_cast<unsigned int>(decoded_data.size());
     SECItem reply;
     reply.data = NULL;
     reply.len = 0;
+#if defined(OS_LINUX)
+    result = PK11SDR_DecryptWithSlot(slot, &request, &reply, NULL);
+#else
     result = PK11SDR_Decrypt(&request, &reply, NULL);
+#endif  // defined(OS_LINUX)
     if (result == SECSuccess)
       plain.assign(reinterpret_cast<char*>(reply.data), reply.len);
 
     SECITEM_FreeItem(&reply, PR_FALSE);
-    PK11_FreeSlot(slot);
+    FreeSlot(slot);
   } else {
     // Deletes the leading '~' before decoding.
     net::Base64Decode(crypt.substr(1), &plain);
   }
 
   return UTF8ToWide(plain);
 }
 
 // There are three versions of password filess. They store saved user
 // names and passwords.
@@ skipping 114 matching lines @@
       }
       // Version 3 has an extra line for further use.
       if (version == 3) {
         ++begin;
       }
 
       forms->push_back(form);
     }
   }
 }