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

components/autofill/content/renderer/page_click_tracker.cc

Index: components/autofill/content/renderer/page_click_tracker.cc
diff --git a/components/autofill/content/renderer/page_click_tracker.cc b/components/autofill/content/renderer/page_click_tracker.cc
index 722537a48f3e0311394fe19726b4096f352ddba2..fa18796a71fd8b9c71709d6e4e91c3e96ec85c8c 100644
--- a/components/autofill/content/renderer/page_click_tracker.cc
+++ b/components/autofill/content/renderer/page_click_tracker.cc
@@ -22,7 +22,6 @@
 
 using blink::WebElement;
 using blink::WebFormControlElement;
-using blink::WebGestureEvent;
 using blink::WebInputElement;
 using blink::WebNode;
 using blink::WebPoint;
@@ -34,7 +33,7 @@ namespace autofill {
 namespace {
 
 // Casts |element| to a WebFormControlElement, but only if it's a text field.
-// Returns an empty (isNull()) wrapper otherwise.
+// Returns an empty (IsNull()) wrapper otherwise.
 const WebFormControlElement GetTextFormControlElement(
     const WebElement& element) {
   if (!element.IsFormControlElement())
@@ -49,24 +48,14 @@ const WebFormControlElement GetTextFormControlElement(
 
 PageClickTracker::PageClickTracker(content::RenderFrame* render_frame,
                                    PageClickListener* listener)
-    : content::RenderFrameObserver(render_frame),
-      focused_node_was_last_clicked_(false),
+    : focused_node_was_last_clicked_(false),
       was_focused_before_now_(false),
       listener_(listener),
-      legacy_(this) {
-}
+      render_frame_(render_frame) {}
 
 PageClickTracker::~PageClickTracker() {
 }
 
-void PageClickTracker::OnMouseDown(const WebNode& mouse_down_node) {
-  focused_node_was_last_clicked_ =
-      !mouse_down_node.IsNull() && mouse_down_node.Focused();
-
-  if (IsKeyboardAccessoryEnabled())
-    DoFocusChangeComplete();
-}
-
 void PageClickTracker::FocusedNodeChanged(const WebNode& node) {
   was_focused_before_now_ = false;
 
@@ -77,13 +66,22 @@ void PageClickTracker::FocusedNodeChanged(const WebNode& node) {
   }
 }
 
-void PageClickTracker::FocusChangeComplete() {
+void PageClickTracker::DidCompleteFocusChangeInFrame() {
   if (IsKeyboardAccessoryEnabled())
     return;
 
   DoFocusChangeComplete();
 }
 
+void PageClickTracker::DidReceiveLeftMouseDownOrGestureTapInNode(
+    const blink::WebNode& node) {
+  DCHECK(!node.IsNull());
+  focused_node_was_last_clicked_ = node.Focused();
+
+  if (IsKeyboardAccessoryEnabled())
+    DoFocusChangeComplete();
+}
+
 void PageClickTracker::DoFocusChangeComplete() {
   WebElement focused_element =
       render_frame()->GetWebFrame()->GetDocument().FocusedElement();
@@ -100,27 +98,4 @@ void PageClickTracker::DoFocusChangeComplete() {
   focused_node_was_last_clicked_ = false;
 }
 
-void PageClickTracker::OnDestruct() {
-  delete this;
-}
-
-// PageClickTracker::Legacy ----------------------------------------------------
-
-PageClickTracker::Legacy::Legacy(PageClickTracker* tracker)
-    : content::RenderViewObserver(tracker->render_frame()->GetRenderView()),
-      tracker_(tracker) {
-}
-
-void PageClickTracker::Legacy::OnDestruct() {
-  // No-op. Don't delete |this|.
-}
-
-void PageClickTracker::Legacy::OnMouseDown(const WebNode& mouse_down_node) {
-  tracker_->OnMouseDown(mouse_down_node);
-}
-
-void PageClickTracker::Legacy::FocusChangeComplete() {
-  tracker_->FocusChangeComplete();
-}
-
 }  // namespace autofill