Fix import Firefox passwords on Windows (silent failure); plds4.dll and nspr4.dll no longer exist

chrome/utility/importer/nss_decryptor_win.cc

Index: chrome/utility/importer/nss_decryptor_win.cc
===================================================================
--- chrome/utility/importer/nss_decryptor_win.cc	(revision 221155)
+++ chrome/utility/importer/nss_decryptor_win.cc	(working copy)
@@ -87,6 +87,12 @@
   HMODULE plds4_dll = GetModuleHandle(kPLDS4Library);
   HMODULE nspr4_dll = GetModuleHandle(kNSPR4Library);
 
+  // On Firefox 22 and higher, NSPR is part of nss3.dll rather than separate
+  // DLLs.

[wtc, 2013/09/18 18:29:05]

For future reference:

In Firefox 22, the NSPR and NSS DLLs were consolidated into fewer
DLLs. Only these DLLs remained:

1. The main NSS DLL (contains NSPR and NSSUTIL)
    nss3.dll

2. The NSS softoken and its dependents

    softokn3.dll
    freebl3.dll
    nssdbm3.dll

3. The NSS built-in root CA certificates

    nssckbi.dll

+  if (plds4_dll == NULL) {
+    plds4_dll = nss3_dll_;
+    nspr4_dll = nss3_dll_;
+  }
   return InitNSS(db_path, plds4_dll, nspr4_dll);
 }
 
@@ -106,12 +112,6 @@
 bool NSSDecryptor::InitNSS(const base::FilePath& db_path,
                            base::NativeLibrary plds4_dll,
                            base::NativeLibrary nspr4_dll) {
-  // NSPR DLLs are already loaded now.
-  if (plds4_dll == NULL || nspr4_dll == NULL) {
-    Free();
-    return false;
-  }

[Ilya Sherman, 2013/09/17 06:14:36]

nit: Are you sure that this code is no longer necessary?

[wtc, 2013/09/18 00:03:47]

Yes. This function (InitNSS) is only called on line 96, and we
make sure plds4_dll and nspr4_dll are both non-null there.

-
   // Gets the function address.
   NSS_Init = (NSSInitFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Init");