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

components/autofill/content/browser/request_autocomplete_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/autofill/content/browser/request_autocomplete_manager.h"
 
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
@@ skipping 17 matching lines @@
     case AutofillClient::AutocompleteResultErrorCancel:
       return blink::WebFormElement::AutocompleteResultErrorCancel;
     case AutofillClient::AutocompleteResultErrorInvalid:
       return blink::WebFormElement::AutocompleteResultErrorInvalid;
   }
 
   NOTREACHED();
   return blink::WebFormElement::AutocompleteResultErrorDisabled;
 }
 
+bool HasValue(const FormFieldData& field) {
+  return !field.value.empty();
+}
+
+// Helper function to set or reset the |is_autofilled| property of fields
+// present in |form_data|.
+void SetAutofillPropertyOfFields(FormData* form_data, bool is_autofilled) {
+  if (HasValue(form_data->username_field))
+    form_data->username_field.is_autofilled = is_autofilled;
+
+  if (HasValue(form_data->password_field))
+    form_data->password_field.is_autofilled = is_autofilled;
+
+  // TODO (pritam.nikam): Make sure we remove |fields|, and add form fields
+  // for all possible autofillable input fields (http://crbug.com/417295).
+  for (size_t i = 0; i < form_data->fields.size(); ++i) {
+    if (HasValue(form_data->fields[i]))
+      form_data->fields[i].is_autofilled = is_autofilled;
+  }
+}
+
 }  // namespace
 
 RequestAutocompleteManager::RequestAutocompleteManager(
     ContentAutofillDriver* autofill_driver)
     : autofill_driver_(autofill_driver), weak_ptr_factory_(this) {
   DCHECK(autofill_driver_);
 }
 
 RequestAutocompleteManager::~RequestAutocompleteManager() {}
 
@@ skipping 24 matching lines @@
     return;
 
   content::RenderViewHost* host =
       autofill_driver_->web_contents()->GetRenderViewHost();
   if (!host)
     return;
 
   FormData form_data;
   if (form_structure) {
     form_data = form_structure->ToFormData();
-    for (size_t i = 0; i < form_data.fields.size(); ++i) {
-      if(!form_data.fields[i].value.empty())
-        form_data.fields[i].is_autofilled = true;
-    }
+    SetAutofillPropertyOfFields(&form_data, true);
   }
 
   host->Send(new AutofillMsg_RequestAutocompleteResult(
       host->GetRoutingID(),
       ToWebkitAutocompleteResult(result),
       debug_message,
       form_data));
 }
 
 void RequestAutocompleteManager::ShowRequestAutocompleteDialog(
     const FormData& form,
     const GURL& source_url,
     const AutofillClient::ResultCallback& callback) {
   AutofillClient* client = autofill_driver_->autofill_manager()->client();
   client->ShowRequestAutocompleteDialog(form, source_url, callback);
 }
 
 }  // namespace autofill