Remove FrameDetached and FrameWillClose listeners from AutofillAgent.

components/autofill/content/renderer/autofill_agent.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/renderer/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
@@ skipping 169 matching lines @@
 }
 
 void AutofillAgent::DidCommitProvisionalLoad(bool is_new_navigation) {
   form_cache_.Reset();
 }
 
 void AutofillAgent::DidFinishDocumentLoad() {
   ProcessForms();
 }
 
-void AutofillAgent::FrameDetached(WebFrame* frame) {
-  if (frame != render_frame()->GetWebFrame())
-    return;
-
-  form_cache_.Reset();

[Dan Beam, 2014/12/20 01:10:51]

does this still need to happen somehow?

[Dan Beam, 2014/12/20 01:13:27]

whoops, from CL desc:
"""AutofillAgent::FrameDetached is no longer necessary because form_cache_ only
holds the forms for a single frame."""

-}
-
 void AutofillAgent::WillSubmitForm(const WebFormElement& form) {
   FormData form_data;
   if (WebFormElementToFormData(form,
                                WebFormControlElement(),
                                REQUIRE_NONE,
                                static_cast<ExtractMask>(
                                    EXTRACT_VALUE | EXTRACT_OPTION_TEXT),
                                &form_data,
                                NULL)) {
     Send(new AutofillHostMsg_FormSubmitted(routing_id(), form_data,
@@ skipping 31 matching lines @@
       !element->isTextField() || element->isPasswordField())
     return;
 
   element_ = *element;
 }
 
 void AutofillAgent::Resized() {
   HidePopup();
 }
 
-void AutofillAgent::LegacyFrameWillClose(blink::WebFrame* frame) {
-  if (in_flight_request_form_.isNull())
-    return;
-
-  for (blink::WebFrame* temp = render_frame()->GetWebFrame(); temp;
-       temp = temp->parent()) {
-    if (temp == frame) {
-      Send(new AutofillHostMsg_CancelRequestAutocomplete(routing_id()));
-      break;
-    }
-  }
-}
-
 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.SchemeIs(url::kHttpsScheme) &&
       !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(),
                                        REQUIRE_AUTOCOMPLETE,
@@ skipping 15 matching lines @@
     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, url));
+  Send(new AutofillHostMsg_RequestAutocomplete(routing_id(), form_data));
 }
 
 void AutofillAgent::setIgnoreTextChanges(bool ignore) {
   ignore_text_changes_ = ignore;
 }
 
 void AutofillAgent::FormControlElementClicked(
     const WebFormControlElement& element,
     bool was_focused) {
   // TODO(estade): Remove this check when PageClickTracker is per-frame.
@@ skipping 470 matching lines @@
     : content::RenderViewObserver(render_view), agent_(agent) {
 }
 
 AutofillAgent::LegacyAutofillAgent::~LegacyAutofillAgent() {
 }
 
 void AutofillAgent::LegacyAutofillAgent::OnDestruct() {
   // No-op. Don't delete |this|.
 }
 
-void AutofillAgent::LegacyAutofillAgent::FrameDetached(WebFrame* frame) {
-  agent_->FrameDetached(frame);
-}
-
 void AutofillAgent::LegacyAutofillAgent::FocusedNodeChanged(
     const WebNode& node) {
   agent_->FocusedNodeChanged(node);
 }
 
 void AutofillAgent::LegacyAutofillAgent::Resized() {
   agent_->Resized();
 }
 
-void AutofillAgent::LegacyAutofillAgent::FrameWillClose(
-    blink::WebFrame* frame) {
-  agent_->LegacyFrameWillClose(frame);
-}
-
 }  // namespace autofill