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..aca613d615f5b45d15572afbbeadf1c892af4475 100644
--- a/chrome/utility/importer/firefox_importer_unittest_utils.h
+++ b/chrome/utility/importer/firefox_importer_unittest_utils.h
@@ -6,9 +6,11 @@
 #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
 
 #include "base/basictypes.h"
+#include "base/file_util.h"
 #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;
 
@@ -44,6 +46,8 @@ class FFUnitTestDecryptorProxy {
   bool DecryptorInit(const base::FilePath& dll_path,
                      const base::FilePath& db_path);
   base::string16 Decrypt(const std::string& crypt);
+  std::vector<autofill::PasswordForm> ParseSignons(
+      const base::FilePath& signons_path);
 
  private:
 #if defined(OS_MACOSX)
@@ -84,6 +88,16 @@ bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
 base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
   return decryptor_.Decrypt(crypt);
 }
+
+std::vector<autofill::PasswordForm> FFUnitTestDecryptorProxy::ParseSignons(
+    const base::FilePath& signons_path) {
+  std::vector<autofill::PasswordForm> signons;
+  if (decryptor_.ReadAndParseSignons(signons_path, &signons))
+    return signons;
+
+  return std::vector<autofill::PasswordForm>();
+}
+
 #endif  // !OS_MACOSX
 
 #endif  // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_