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)
@@ -106,12 +106,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;
-  }
-
   // Gets the function address.
   NSS_Init = (NSSInitFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Init");
@@ -128,10 +122,16 @@
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11SDR_Decrypt");
   SECITEM_FreeItem = (SECITEMFreeItemFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "SECITEM_FreeItem");
-  PL_ArenaFinish = (PLArenaFinishFunc)
-      base::GetFunctionPointerFromNativeLibrary(plds4_dll, "PL_ArenaFinish");
-  PR_Cleanup = (PRCleanupFunc)
-      base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PR_Cleanup");
+  // FireFox 22 and higher PL_ArenaFinish moved from plds4.dll to nss3.dll

[Avi (use Gerrit), 2013/09/06 20:43:47]

It's "Firefox" rather than "FireFox".

+  PL_ArenaFinish = (PLArenaFinishFunc)(
+      (plds4_dll != NULL)
+      ? base::GetFunctionPointerFromNativeLibrary(plds4_dll, "PL_ArenaFinish")
+      : base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PL_ArenaFinish"));

[Ilya Sherman, 2013/09/06 21:32:47]

nit: Please define a local variable for the DLL, rather than repeating a good
chunk of code in the ternary stmt.  Ditto below.

+  // FireFox 22 and higher PR_Cleanup moved from nspr4.dll to nss3.dll
+  PR_Cleanup = (PRCleanupFunc)(
+      (nspr4_dll != NULL)
+      ? base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PR_Cleanup")
+      : base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PR_Cleanup"));
 
   if (NSS_Init == NULL || NSS_Shutdown == NULL ||
       PK11_GetInternalKeySlot == NULL || PK11_FreeSlot == NULL ||