Autofill: Refactoring to support fetching password after a username is selected

components/password_manager/core/browser/password_manager.cc

Index: components/password_manager/core/browser/password_manager.cc
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 107ce1e8bed13772209c7acd4296619f58ebea77..ba256cabed63a025fdc07dd4d6efb0976c510434 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -11,7 +11,9 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
+#include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/password_autofill_util.h"
+#include "components/password_manager/core/browser/password_autofill_manager.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
@@ -228,6 +230,8 @@ void PasswordManager::DidNavigateMainFrame(bool is_in_page) {
   // different page.
   if (!is_in_page)
     pending_login_managers_.clear();
+
+  driver_->GetPasswordAutofillManager()->Reset();

[Garrett Casto, 2014/03/12 01:09:22]

This should only happen if the navigation is not in page.

[Patrick Dubroy, 2014/03/12 16:47:09]

Done.

 }
 
 void PasswordManager::OnPasswordFormSubmitted(
@@ -310,6 +314,31 @@ void PasswordManager::OnPasswordFormsRendered(
   }
 }
 
+void PasswordManager::OnAddPasswordFormMapping(

[Garrett Casto, 2014/03/12 01:09:22]

Any reason why you are doing Driver -> PasswordManager ->
PasswordAutofillManager instead of just Driver->PasswordAutofillManager? 

[Patrick Dubroy, 2014/03/12 16:47:09]

Do you mean why is this function defined in PasswordManager, rather than
directly in ContentPasswordManagerDriver?

I put it here to directly parallel the old code, and also because all the other
IPC handlers are here. However, if you think it's better to just put it in the
driver, I can do that too.

[Garrett Casto, 2014/03/14 08:25:22]

I guess it depends on how you think the code should be organized. I was thinking
of the *Manager classes as peers, not the PasswordManager as the primary manager
that delegated to the others. That being said, the fact that we are going to
only monitor for navigation in this class leans towards having the
PasswordManager as primary. Seems like the indirection isn't really getting you
anything, but I'll accept it either way.

[Patrick Dubroy, 2014/03/14 12:07:19]

Makes sense. Fixed to be as you described.

+    const autofill::FormFieldData& username_field,
+    const autofill::PasswordFormFillData& fill_data) {
+  if (!autofill::IsValidFormFieldData(username_field) ||
+      !autofill::IsValidPasswordFormFillData(fill_data))
+    return;
+
+  driver_->GetPasswordAutofillManager()->AddPasswordFormMapping(
+      username_field, fill_data);
+}
+
+void PasswordManager::OnShowPasswordSuggestions(
+    const autofill::FormFieldData& field,
+    const gfx::RectF& bounds,
+    const std::vector<base::string16>& suggestions,
+    const std::vector<base::string16>& realms) {
+  if (!autofill::IsValidString16Vector(suggestions) ||
+      !autofill::IsValidString16Vector(realms) ||
+      suggestions.size() != realms.size())
+    return;
+
+  driver_->GetPasswordAutofillManager()->ShowPasswordSuggestions(
+      field, bounds, suggestions, realms);
+}
+
 void PasswordManager::PossiblyInitializeUsernamesExperiment(
     const PasswordFormMap& best_matches) const {
   if (base::FieldTrialList::Find(kOtherPossibleUsernamesExperiment))