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

chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 65 matching lines @@
     sender_ = sender;
   }
 
   void OnInitDecryptorResponse(bool result) {
     DCHECK(!got_result);
     result_bool = result;
     got_result = true;
     base::MessageLoop::current()->Quit();
   }
 
-  void OnDecryptedTextResonse(const base::string16& decrypted_text) {
+  void OnDecryptedTextResponse(const base::string16& decrypted_text) {
     DCHECK(!got_result);
     result_string = decrypted_text;
     got_result = true;
     base::MessageLoop::current()->Quit();
   }
 
+  void OnParseSignonsResponse(
+      const std::vector<autofill::PasswordForm>& parsed_vector) {
+    DCHECK(!got_result);
+    result_vector = parsed_vector;
+    got_result = true;
+    base::MessageLoop::current()->Quit();
+  }
+
   void QuitClient() {
     if (sender_)
       sender_->Send(new Msg_Decryptor_Quit());
   }
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorServerChannelListener, msg)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_InitReturnCode, OnInitDecryptorResponse)
-      IPC_MESSAGE_HANDLER(Msg_Decryptor_Response, OnDecryptedTextResonse)
+      IPC_MESSAGE_HANDLER(Msg_Decryptor_Response, OnDecryptedTextResponse)
+      IPC_MESSAGE_HANDLER(Msg_ParseSignons_Response, OnParseSignonsResponse)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   // If an error occured, just kill the message Loop.
   virtual void OnChannelError() OVERRIDE {
     got_result = false;
     base::MessageLoop::current()->Quit();
   }
 
   // Results of IPC calls.
   base::string16 result_string;
+  std::vector<autofill::PasswordForm> result_vector;
   bool result_bool;
   // True if IPC call succeeded and data in above variables is valid.
   bool got_result;
 
  private:
   IPC::Sender* sender_;  // weak
 };
 
 FFUnitTestDecryptorProxy::FFUnitTestDecryptorProxy()
     : child_process_(0) {
@@ skipping 77 matching lines @@
 base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
   channel_->Send(new Msg_Decrypt(crypt));
   bool ok = WaitForClientResponse();
   if (ok && listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_string;
   }
   return base::string16();
 }
 
+std::vector<autofill::PasswordForm> FFUnitTestDecryptorProxy::ParseSignons(
+    const base::FilePath& signons_path) {
+  channel_->Send(new Msg_ParseSignons(signons_path));
+  bool ok = WaitForClientResponse();
+  if (ok && listener_->got_result) {
+    listener_->got_result = false;
+    return listener_->result_vector;
+  }
+  return std::vector<autofill::PasswordForm>();
+}
+
 //---------------------------- Child Process -----------------------
 
 // Class to listen on the client side of the ipc channel, it calls through
 // to the NSSDecryptor and sends back a reply.
 class FFDecryptorClientChannelListener : public IPC::Listener {
  public:
   FFDecryptorClientChannelListener()
       : sender_(NULL) {}
 
   void SetSender(IPC::Sender* sender) {
     sender_ = sender;
   }
 
   void OnDecryptor_Init(base::FilePath dll_path, base::FilePath db_path) {
     bool ret = decryptor_.Init(dll_path, db_path);
     sender_->Send(new Msg_Decryptor_InitReturnCode(ret));
   }
 
   void OnDecrypt(std::string crypt) {
     base::string16 unencrypted_str = decryptor_.Decrypt(crypt);
     sender_->Send(new Msg_Decryptor_Response(unencrypted_str));
   }
 
+  void OnParseSignons(base::FilePath signons_path) {
+    std::vector<autofill::PasswordForm> forms;
+    decryptor_.ReadAndParseSignons(signons_path, &forms);
+    sender_->Send(new Msg_ParseSignons_Response(forms));
+  }
+
   void OnQuitRequest() {
     base::MessageLoop::current()->Quit();
   }
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorClientChannelListener, msg)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Init, OnDecryptor_Init)
       IPC_MESSAGE_HANDLER(Msg_Decrypt, OnDecrypt)
+      IPC_MESSAGE_HANDLER(Msg_ParseSignons, OnParseSignons)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Quit, OnQuitRequest)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   virtual void OnChannelError() OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
 
@@ skipping 10 matching lines @@
   scoped_ptr<IPC::Channel> channel = IPC::Channel::CreateClient(
       kTestChannelID, &listener);
   CHECK(channel->Connect());
   listener.SetSender(channel.get());
 
   // run message loop
   base::MessageLoop::current()->Run();
 
   return 0;
 }