[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..9d01fbf890e2cbb5864ce616eb2465075b3b5ed9 100644
--- a/components/autofill/content/renderer/page_click_tracker.h
+++ b/components/autofill/content/renderer/page_click_tracker.h
@@ -10,7 +10,6 @@
 #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 autofill {
@@ -34,30 +33,14 @@ class PageClickTracker : public content::RenderFrameObserver {
   ~PageClickTracker() override;
 
  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 DidCompleteFocusChangeInFrame() override;
+  void DidCompleteLeftMouseDownOrGestureTapInNode(
+      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,8 +54,6 @@ class PageClickTracker : public content::RenderFrameObserver {
   // The listener getting the actual notifications.
   PageClickListener* listener_;
 
-  Legacy legacy_;
-
   DISALLOW_COPY_AND_ASSIGN(PageClickTracker);
 };