[Password manager] Relplace the FormFieldData vector from autofill::FormData with named fields…

components/password_manager/core/browser/password_autofill_manager.cc

 // Copyright 2013 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_autofill_manager.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 11 matching lines @@
 
 // This function attempts to fill |suggestions| and |realms| form |fill_data|
 // based on |current_username|. Unless |show_all| is true, it only picks
 // suggestions where the username has |current_username| as a prefix.
 void GetSuggestions(const autofill::PasswordFormFillData& fill_data,
                     const base::string16& current_username,
                     std::vector<base::string16>* suggestions,
                     std::vector<base::string16>* realms,
                     bool show_all) {
   if (show_all ||
-      StartsWith(
-          fill_data.basic_data.fields[0].value, current_username, false)) {
-    suggestions->push_back(fill_data.basic_data.fields[0].value);
+      StartsWith(fill_data.username_field.value, current_username, false)) {
+    suggestions->push_back(fill_data.username_field.value);
     realms->push_back(base::UTF8ToUTF16(fill_data.preferred_realm));
   }
 
   for (const auto& login : fill_data.additional_logins) {
     if (show_all || StartsWith(login.first, current_username, false)) {
       suggestions->push_back(login.first);
       realms->push_back(base::UTF8ToUTF16(login.second.realm));
     }
   }
 
@@ skipping 149 matching lines @@
 
 bool PasswordAutofillManager::GetPasswordForUsername(
     const base::string16& current_username,
     const autofill::PasswordFormFillData& fill_data,
     base::string16* password) {
   // TODO(dubroy): When password access requires some kind of authentication
   // (e.g. Keychain access on Mac OS), use |password_manager_client_| here to
   // fetch the actual password. See crbug.com/178358 for more context.
 
   // Look for any suitable matches to current field text.
-  if (fill_data.basic_data.fields[0].value == current_username) {
-    *password = fill_data.basic_data.fields[1].value;
+  if (fill_data.username_field.value == current_username) {
+    *password = fill_data.password_field.value;
     return true;
   }
 
   // Scan additional logins for a match.
   for (autofill::PasswordFormFillData::LoginCollection::const_iterator iter =
            fill_data.additional_logins.begin();
        iter != fill_data.additional_logins.end();
        ++iter) {
     if (iter->first == current_username) {
       *password = iter->second.password;
@@ skipping 21 matching lines @@
     autofill::PasswordFormFillData* found_password) {
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(key);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_password = iter->second;
   return true;
 }
 
 }  //  namespace password_manager