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

components/password_manager/core/browser/password_manager.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 "components/password_manager/core/browser/password_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #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"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 using autofill::PasswordForm;
 using autofill::PasswordFormMap;
 
@@ skipping 196 matching lines @@
 
 void PasswordManager::RemoveObserver(LoginModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void PasswordManager::DidNavigateMainFrame(bool is_in_page) {
   // Clear data after main frame navigation if the navigation was to a
   // 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(
     const PasswordForm& password_form) {
   ProvisionallySavePassword(password_form);
   for (size_t i = 0; i < submission_callbacks_.size(); ++i) {
     submission_callbacks_[i].Run(password_form);
   }
 
   pending_login_managers_.clear();
@@ skipping 62 matching lines @@
     UMA_HISTOGRAM_COUNTS("PasswordGeneration.Submitted", 1);
 
   if (ShouldPromptUserToSavePassword()) {
     client_->PromptUserToSavePassword(provisional_save_manager_.release());
   } else {
     provisional_save_manager_->Save();
     provisional_save_manager_.reset();
   }
 }
 
+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))
     return;
 
   bool other_possible_usernames_exist = false;
   for (autofill::PasswordFormMap::const_iterator it = best_matches.begin();
        it != best_matches.end(); ++it) {
     if (!it->second->other_possible_usernames.empty()) {
       other_possible_usernames_exist = true;
@@ skipping 62 matching lines @@
       FOR_EACH_OBSERVER(
           LoginModelObserver,
           observers_,
           OnAutofillDataAvailable(preferred_match.username_value,
                                   preferred_match.password_value));
       break;
   }
 
   client_->PasswordWasAutofilled(best_matches);
 }