| Index: chrome/renderer/autofill/autofill_agent.cc
 | 
| diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
 | 
| index c0531b4d96e726b70ac812dfa8b4c5c9ddcaed6d..f67e8a33f2cd264d5e9711a971ac056fcd85a098 100644
 | 
| --- a/chrome/renderer/autofill/autofill_agent.cc
 | 
| +++ b/chrome/renderer/autofill/autofill_agent.cc
 | 
| @@ -160,10 +160,8 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
 | 
|                          OnAcceptDataListSuggestion)
 | 
|      IPC_MESSAGE_HANDLER(AutofillMsg_AcceptPasswordAutofillSuggestion,
 | 
|                          OnAcceptPasswordAutofillSuggestion)
 | 
| -    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteSuccess,
 | 
| -                        OnRequestAutocompleteSuccess)
 | 
| -    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteError,
 | 
| -                        OnRequestAutocompleteError)
 | 
| +    IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteResult,
 | 
| +                        OnRequestAutocompleteResult)
 | 
|      IPC_MESSAGE_UNHANDLED(handled = false)
 | 
|    IPC_END_MESSAGE_MAP()
 | 
|    return handled;
 | 
| @@ -226,7 +224,7 @@ void AutofillAgent::didRequestAutocomplete(WebKit::WebFrame* frame,
 | 
|                                  &form_data,
 | 
|                                  NULL)) {
 | 
|      WebFormElement(form).finishRequestAutocomplete(
 | 
| -        WebFormElement::AutocompleteResultError);
 | 
| +        WebFormElement::AutocompleteResultErrorDisabled);
 | 
|      return;
 | 
|    }
 | 
|  
 | 
| @@ -602,22 +600,15 @@ void AutofillAgent::OnAcceptPasswordAutofillSuggestion(const string16& value) {
 | 
|    DCHECK(handled);
 | 
|  }
 | 
|  
 | 
| -void AutofillAgent::FinishAutocompleteRequest(
 | 
| -    WebFormElement::AutocompleteResult result) {
 | 
| +void AutofillAgent::OnRequestAutocompleteResult(
 | 
| +    WebFormElement::AutocompleteResult result, const FormData& form_data) {
 | 
|    DCHECK(!in_flight_request_form_.isNull());
 | 
| +  if (result == WebFormElement::AutocompleteResultSuccess)
 | 
| +    FillFormIncludingNonFocusableElements(form_data, in_flight_request_form_);
 | 
|    in_flight_request_form_.finishRequestAutocomplete(result);
 | 
|    in_flight_request_form_.reset();
 | 
|  }
 | 
|  
 | 
| -void AutofillAgent::OnRequestAutocompleteSuccess(const FormData& form_data) {
 | 
| -  FillFormIncludingNonFocusableElements(form_data, in_flight_request_form_);
 | 
| -  FinishAutocompleteRequest(WebFormElement::AutocompleteResultSuccess);
 | 
| -}
 | 
| -
 | 
| -void AutofillAgent::OnRequestAutocompleteError() {
 | 
| -  FinishAutocompleteRequest(WebFormElement::AutocompleteResultError);
 | 
| -}
 | 
| -
 | 
|  void AutofillAgent::ShowSuggestions(const WebInputElement& element,
 | 
|                                      bool autofill_on_empty_values,
 | 
|                                      bool requires_caret_at_end,
 | 
| 
 |