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

chrome/utility/importer/firefox_importer_unittest_utils.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
 #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;
 
 namespace base {
 class MessageLoopForIO;
 }
 
 namespace IPC {
 class Channel;
 }  // namespace IPC
@@ skipping 15 matching lines @@
   virtual ~FFUnitTestDecryptorProxy();
 
   // Initialize a decryptor, returns true if the object was
   // constructed successfully.
   bool Setup(const base::FilePath& nss_path);
 
   // This match the parallel functions in NSSDecryptor.
   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)
   // Blocks until either a timeout is reached, or until the client process
   // responds to an IPC message.
   // Returns true if a reply was received successfully and false if the
   // the operation timed out.
   bool WaitForClientResponse();
 
   base::ProcessHandle child_process_;
@@ skipping 20 matching lines @@
 }
 
 bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
                                              const base::FilePath& db_path) {
   return decryptor_.Init(dll_path, db_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> out_vec;

[Ilya Sherman, 2014/06/13 21:57:03]

nit: Please avoid abbreviations in variable names.  In this case, "signons" or
even just "result" would be reasonable variable names.

+  if (decryptor_.ReadAndParseSignons(signons_path, &out_vec))
+    return out_vec;
+
+  return std::vector<autofill::PasswordForm>();
+}
+
 #endif  // !OS_MACOSX
 
 #endif  // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_