NSSDecryptor::ReadAndParseSignons() - improved password form scheme detection,

chrome/utility/importer/firefox_importer_unittest_utils.h

Index: chrome/utility/importer/firefox_importer_unittest_utils.h
diff --git a/chrome/utility/importer/firefox_importer_unittest_utils.h b/chrome/utility/importer/firefox_importer_unittest_utils.h
index 2c20991629b8620b85ec0e6a19ee38582b0d095a..cdc5341ef0ecfad25f5dc7482b70ab39e98b1a99 100644
--- a/chrome/utility/importer/firefox_importer_unittest_utils.h
+++ b/chrome/utility/importer/firefox_importer_unittest_utils.h
@@ -9,6 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
 #include "chrome/utility/importer/nss_decryptor.h"
+#include "components/autofill/core/common/password_form.h"
 
 class FFDecryptorServerChannelListener;
 
@@ -20,6 +21,8 @@ namespace IPC {
 class Channel;
 }  // namespace IPC
 
+typedef std::vector<autofill::PasswordForm> PasswordFormVector;

[vabr (Chromium), 2014/06/05 16:36:20]

Please don't pollute the global namespace with this typedef. If you really need
it, could you move it inside FFUnitTestDecryptorProxy?

+
 // On OS X NSSDecryptor needs to run in a separate process. To allow us to use
 // the same unit test on all platforms we use a proxy class which spawns a
 // child process to do decryption on OS X, and calls through directly
@@ -44,6 +47,7 @@ class FFUnitTestDecryptorProxy {
   bool DecryptorInit(const base::FilePath& dll_path,
                      const base::FilePath& db_path);
   base::string16 Decrypt(const std::string& crypt);
+  PasswordFormVector ParseSignons(const base::FilePath& signons_path);
 
  private:
 #if defined(OS_MACOSX)
@@ -84,6 +88,12 @@ bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
 base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
   return decryptor_.Decrypt(crypt);
 }
+
+PasswordFormVector FFUnitTestDecryptorProxy::ParseSignons(
+    const base::FilePath& signons_path) {
+  return decryptor_.ParseSignons(signons_path);
+}
+
 #endif  // !OS_MACOSX
 
 #endif  // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_