[autofill] Fill in values on a successful run of interactive autocomplete.

chrome/renderer/autofill/autofill_agent.cc

Index: chrome/renderer/autofill/autofill_agent.cc
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 69fd3ede8c5a02cb4a157d8105c24e55ad0d1cd8..f87e30c533c4556904800efca94e55a6f12291a3 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -158,8 +158,10 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
                         OnAcceptDataListSuggestion)
     IPC_MESSAGE_HANDLER(AutofillMsg_AcceptPasswordAutofillSuggestion,
                         OnAcceptPasswordAutofillSuggestion)
-    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteFinished,
-                        OnRequestAutocompleteFinished)
+    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteSuccess,
+                        OnRequestAutocompleteSuccess)
+    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteError,
+                        OnRequestAutocompleteError)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -331,8 +333,8 @@ void AutofillAgent::textFieldDidEndEditing(const WebInputElement& element) {
 
 void AutofillAgent::textFieldDidChange(const WebInputElement& element) {
   if (did_set_node_text_) {
-      did_set_node_text_ = false;
-      return;
+    did_set_node_text_ = false;
+    return;
   }
 
   // We post a task for doing the Autofill as the caret position is not set
@@ -589,11 +591,40 @@ void AutofillAgent::OnAcceptPasswordAutofillSuggestion(const string16& value) {
   DCHECK(handled);
 }
 
-void AutofillAgent::OnRequestAutocompleteFinished(
-    WebFormElement::AutocompleteResult result) {
+void AutofillAgent::OnRequestAutocompleteSuccess(const FormData& form_data) {
   DCHECK(!in_flight_request_form_.isNull());
 
-  in_flight_request_form_.finishRequestAutocomplete(result);
+  // TODO(dbeam): handle <select>s?

[Ilya Sherman, 2012/11/29 08:24:01]

What's part of the current code fails to handle <select> elements properly?

+  std::vector<WebKit::WebFormControlElement> elements;
+  autofill::ExtractAutofillableElements(in_flight_request_form_,
+                                        REQUIRE_AUTOCOMPLETE,
+                                        &elements);
+
+  for (size_t i = 0; i < form_data.fields.size(); ++i) {
+    // TODO(dbeam): change to DCHECK() if values must be non-empty to confirm.
+    const FormFieldData& form_field_data = form_data.fields[i];
+    if (form_field_data.value.empty())
+      continue;
+
+    for (size_t j = 0; j < elements.size(); ++j) {
+      if (LowerCaseEqualsASCII(
+              elements[j].getAttribute("autocomplete"),
+              form_field_data.autocomplete_attribute.c_str())) {

[Ilya Sherman, 2012/11/29 08:24:01]

Hmm, is form_field_data.autocomplete_attribute actually guaranteed to be in
lowercase?  In fact, why are we doing the comparison in lowercase?  Shouldn't
they just match exactly, case and all?

+        autofill::FillFormField(form_field_data, false, &elements[j]);
+        break;

[Ilya Sherman, 2012/11/29 08:24:01]

Why break out of the loop here?

+      }
+    }
+  }

[Ilya Sherman, 2012/11/29 08:24:01]

If you decide to keep this logic, please move it into form_autofill_util and add
test coverage for it.

+
+  in_flight_request_form_.finishRequestAutocomplete(
+      WebFormElement::AutocompleteResultSuccess);
+  in_flight_request_form_.reset();
+}
+
+void AutofillAgent::OnRequestAutocompleteError() {
+  DCHECK(!in_flight_request_form_.isNull());
+  in_flight_request_form_.finishRequestAutocomplete(
+      WebFormElement::AutocompleteResultError);
   in_flight_request_form_.reset();
 }