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

components/autofill/content/renderer/autofill_agent.cc

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 a0e275a98b78d2ec95e7177d25233c59cd00bb6b..51209d34dd5115230775f990075f4b2367be4e97 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -147,7 +147,6 @@ AutofillAgent::AutofillAgent(content::RenderFrame* 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),
@@ -280,11 +279,10 @@ void AutofillAgent::FireHostSubmitEvents(const FormData& 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())
@@ -799,28 +797,4 @@ AutofillAgent::GetPasswordManagerDriver() {
   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