[refactor] Fix autofill features for payments when the form is inside an OOPIF

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 <stddef.h>
 
 #include <tuple>
 
@@ skipping 129 matching lines @@
       show_password_suggestions_only(false) {
 }
 
 AutofillAgent::AutofillAgent(content::RenderFrame* render_frame,
                              PasswordAutofillAgent* password_autofill_agent,
                              PasswordGenerationAgent* password_generation_agent)
     : content::RenderFrameObserver(render_frame),
       form_cache_(*render_frame->GetWebFrame()),
       password_autofill_agent_(password_autofill_agent),
       password_generation_agent_(password_generation_agent),
-      legacy_(render_frame->GetRenderView(), this),
       autofill_query_id_(0),
       was_query_node_autofilled_(false),
       ignore_text_changes_(false),
       is_popup_possibly_visible_(false),
       is_generation_popup_possibly_visible_(false),
       binding_(this),
       weak_ptr_factory_(this) {
   render_frame->GetWebFrame()->setAutofillClient(this);
   password_autofill_agent->SetAutofillAgent(this);
 
@@ skipping 112 matching lines @@
     submitted_forms_.insert(form_data);
   }
 
   if (form_submitted) {
     GetAutofillDriver()->FormSubmitted(form_data);
   }
 }
 
 void AutofillAgent::Shutdown() {
   binding_.Close();
-  legacy_.Shutdown();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void AutofillAgent::FocusChangeComplete() {
+void AutofillAgent::DidCompleteFocusChangeInFrame() {
   WebDocument doc = render_frame()->GetWebFrame()->document();
   WebElement focused_element;
   if (!doc.isNull())
     focused_element = doc.focusedElement();
   // PasswordGenerationAgent needs to know about focus changes, even if there is
   // no focused element.
   if (password_generation_agent_ &&
       password_generation_agent_->FocusedNodeHasChanged(focused_element)) {
     is_generation_popup_possibly_visible_ = true;
     is_popup_possibly_visible_ = true;
@@ skipping 494 matching lines @@
 
   return autofill_driver_;
 }
 
 const mojom::PasswordManagerDriverPtr&
 AutofillAgent::GetPasswordManagerDriver() {
   DCHECK(password_autofill_agent_);
   return password_autofill_agent_->GetPasswordManagerDriver();
 }
 
-// LegacyAutofillAgent ---------------------------------------------------------
-
-AutofillAgent::LegacyAutofillAgent::LegacyAutofillAgent(
-    content::RenderView* render_view,
-    AutofillAgent* agent)
-    : content::RenderViewObserver(render_view), agent_(agent) {
-}
-
-AutofillAgent::LegacyAutofillAgent::~LegacyAutofillAgent() {
-}
-
-void AutofillAgent::LegacyAutofillAgent::Shutdown() {
-  agent_ = nullptr;
-}
-
-void AutofillAgent::LegacyAutofillAgent::OnDestruct() {
-  // No-op. Don't delete |this|.
-}
-
-void AutofillAgent::LegacyAutofillAgent::FocusChangeComplete() {
-  if (agent_)
-    agent_->FocusChangeComplete();
-}
-
 }  // namespace autofill