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

components/autofill/content/renderer/page_click_tracker.h

Index: components/autofill/content/renderer/page_click_tracker.h
diff --git a/components/autofill/content/renderer/page_click_tracker.h b/components/autofill/content/renderer/page_click_tracker.h
index f77b7a4b5f428b3d29b6f6e4fd1e9e290e13474d..3b1dda447cb1b13c0be2aff62e2369f38b4bb21d 100644
--- a/components/autofill/content/renderer/page_click_tracker.h
+++ b/components/autofill/content/renderer/page_click_tracker.h
@@ -9,10 +9,12 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/renderer/render_frame_observer.h"
-#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 
+namespace content {
+class RenderFrame;
+}
+
 namespace autofill {
 
 class PageClickListener;
@@ -25,39 +27,21 @@ class PageClickListener;
 // suggestion popup when a text input is clicked.
 //
 // There is one PageClickTracker per AutofillAgent.
-class PageClickTracker : public content::RenderFrameObserver {
+class PageClickTracker {
  public:
   // The |listener| will be notified when an element is clicked.  It must
   // outlive this class.
   PageClickTracker(content::RenderFrame* render_frame,
                    PageClickListener* listener);
-  ~PageClickTracker() override;
+  ~PageClickTracker();
+
+  void FocusedNodeChanged(const blink::WebNode& node);
+  void DidCompleteFocusChangeInFrame();
+  void DidReceiveLeftMouseDownOrGestureTapInNode(const blink::WebNode& node);
+
+  content::RenderFrame* render_frame() const { return render_frame_; }
 
  private:
-  // TODO(estade): migrate this stuff to content::RenderFrameObserver, and
-  // remove this class.
-  class Legacy : public content::RenderViewObserver {
-   public:
-    Legacy(PageClickTracker* tracker);
-
-    // RenderViewObserver implementation.
-    void OnDestruct() override;
-    void OnMouseDown(const blink::WebNode& mouse_down_node) override;
-    void FocusChangeComplete() override;
-
-   private:
-    PageClickTracker* tracker_;
-  };
-  friend class Legacy;
-
-  // RenderFrameObserver implementation.
-  void FocusedNodeChanged(const blink::WebNode& node) override;
-  void OnDestruct() override;
-
-  // RenderViewObserver methods forwarded from Legacy. Should be
-  // merged into RenderFrameObserver.
-  void OnMouseDown(const blink::WebNode& mouse_down_node);
-  void FocusChangeComplete();
   void DoFocusChangeComplete();
 
   // True when the last click was on the focused node.
@@ -71,7 +55,7 @@ class PageClickTracker : public content::RenderFrameObserver {
   // The listener getting the actual notifications.
   PageClickListener* listener_;
 
-  Legacy legacy_;
+  content::RenderFrame* const render_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(PageClickTracker);
 };