Index: components/autofill/content/renderer/autofill_agent.cc |
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc |
index cb55cf19c5ca47e31378ce785e207b2534e79827..8ee04e6429f6a4c908d2d6e295ed8056e5a7a9e2 100644 |
--- a/components/autofill/content/renderer/autofill_agent.cc |
+++ b/components/autofill/content/renderer/autofill_agent.cc |
@@ -220,8 +220,6 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) { |
OnFillPasswordSuggestion) |
IPC_MESSAGE_HANDLER(AutofillMsg_PreviewPasswordSuggestion, |
OnPreviewPasswordSuggestion) |
- IPC_MESSAGE_HANDLER(AutofillMsg_RequestAutocompleteResult, |
- OnRequestAutocompleteResult) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -342,57 +340,6 @@ void AutofillAgent::FocusChangeComplete() { |
} |
} |
-void AutofillAgent::didRequestAutocomplete( |
- const WebFormElement& form) { |
- DCHECK_EQ(form.document().frame(), render_frame()->GetWebFrame()); |
- |
- // Disallow the dialog over non-https or broken https, except when the |
- // ignore SSL flag is passed. See http://crbug.com/272512. |
- // TODO(palmer): this should be moved to the browser process after frames |
- // get their own processes. |
- GURL url(form.document().url()); |
- content::SSLStatus ssl_status = |
- render_frame()->GetRenderView()->GetSSLStatusOfFrame( |
- form.document().frame()); |
- bool is_safe = url.SchemeIsCryptographic() && |
- !net::IsCertStatusError(ssl_status.cert_status); |
- bool allow_unsafe = base::CommandLine::ForCurrentProcess()->HasSwitch( |
- ::switches::kReduceSecurityForTesting); |
- FormData form_data; |
- std::string error_message; |
- if (!in_flight_request_form_.isNull()) { |
- error_message = "already active."; |
- } else if (!is_safe && !allow_unsafe) { |
- error_message = |
- "must use a secure connection or --reduce-security-for-testing."; |
- } else if (!WebFormElementToFormData( |
- form, WebFormControlElement(), |
- static_cast<form_util::ExtractMask>( |
- form_util::EXTRACT_VALUE | form_util::EXTRACT_OPTION_TEXT | |
- form_util::EXTRACT_OPTIONS), |
- &form_data, NULL)) { |
- error_message = "failed to parse form."; |
- } |
- |
- if (!error_message.empty()) { |
- WebConsoleMessage console_message = WebConsoleMessage( |
- WebConsoleMessage::LevelLog, |
- WebString(base::ASCIIToUTF16("requestAutocomplete: ") + |
- base::ASCIIToUTF16(error_message))); |
- form.document().frame()->addMessageToConsole(console_message); |
- WebFormElement(form).finishRequestAutocomplete( |
- WebFormElement::AutocompleteResultErrorDisabled); |
- return; |
- } |
- |
- // Cancel any pending Autofill requests and hide any currently showing popups. |
- ++autofill_query_id_; |
- HidePopup(); |
- |
- in_flight_request_form_ = form; |
- Send(new AutofillHostMsg_RequestAutocomplete(routing_id(), form_data)); |
-} |
- |
void AutofillAgent::setIgnoreTextChanges(bool ignore) { |
ignore_text_changes_ = ignore; |
} |
@@ -664,33 +611,6 @@ void AutofillAgent::OnSamePageNavigationCompleted() { |
last_interacted_form_.reset(); |
} |
-void AutofillAgent::OnRequestAutocompleteResult( |
- WebFormElement::AutocompleteResult result, |
- const base::string16& message, |
- const FormData& form_data) { |
- if (in_flight_request_form_.isNull()) |
- return; |
- |
- if (result == WebFormElement::AutocompleteResultSuccess) { |
- form_util::FillFormIncludingNonFocusableElements(form_data, |
- in_flight_request_form_); |
- if (!in_flight_request_form_.checkValidity()) |
- result = WebFormElement::AutocompleteResultErrorInvalid; |
- } |
- |
- in_flight_request_form_.finishRequestAutocomplete(result); |
- |
- if (!message.empty()) { |
- const base::string16 prefix(base::ASCIIToUTF16("requestAutocomplete: ")); |
- WebConsoleMessage console_message = WebConsoleMessage( |
- WebConsoleMessage::LevelLog, WebString(prefix + message)); |
- in_flight_request_form_.document().frame()->addMessageToConsole( |
- console_message); |
- } |
- |
- in_flight_request_form_.reset(); |
-} |
- |
void AutofillAgent::ShowSuggestions(const WebFormControlElement& element, |
const ShowSuggestionsOptions& options) { |
if (!element.isEnabled() || element.isReadOnly()) |