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

components/autofill/content/renderer/autofill_agent.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/autofill/content/common/autofill_agent.mojom.h"
 #include "components/autofill/content/common/autofill_driver.mojom.h"
 #include "components/autofill/content/renderer/form_cache.h"
 #include "components/autofill/content/renderer/page_click_listener.h"
+#include "components/autofill/content/renderer/page_click_tracker.h"
 #include "content/public/renderer/render_frame_observer.h"
-#include "content/public/renderer/render_view_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 
 namespace blink {
 class WebNode;
 class WebView;
 }
@@ skipping 45 matching lines @@
   void FillPasswordSuggestion(const base::string16& username,
                               const base::string16& password) override;
   void PreviewPasswordSuggestion(const base::string16& username,
                                  const base::string16& password) override;
   void ShowInitialPasswordAccountSuggestions(
       int32_t key,
       const PasswordFormFillData& form_data) override;
 
   void ShowNotSecureWarning(const blink::WebInputElement& element);
 
+  void set_page_click_tracker_for_testing(
+      std::unique_ptr<PageClickTracker> page_click_tracker) {
+    page_click_tracker_ = std::move(page_click_tracker);
+  }
+
  protected:
   // blink::WebAutofillClient:
   void DidAssociateFormControlsDynamically() override;
 
  private:
   // Functor used as a simplified comparison function for FormData. Only
   // compares forms at a high level (notably name, origin, action).
   struct FormDataCompare {
     bool operator()(const FormData& lhs, const FormData& rhs) const;
   };
 
-  // Thunk class for RenderViewObserver methods that haven't yet been migrated
-  // to RenderFrameObserver. Should eventually be removed.
-  // http://crbug.com/433486
-  class LegacyAutofillAgent : public content::RenderViewObserver {
-   public:
-    LegacyAutofillAgent(content::RenderView* render_view, AutofillAgent* agent);
-    ~LegacyAutofillAgent() override;
-
-    // Shuts the LegacyAutofillAgent down on RenderFrame deletion. Safe to call
-    // multiple times.
-    void Shutdown();
-
-   private:
-    // content::RenderViewObserver:
-    void OnDestruct() override;
-    void FocusChangeComplete() override;
-
-    AutofillAgent* agent_;
-
-    DISALLOW_COPY_AND_ASSIGN(LegacyAutofillAgent);
-  };
-  friend class LegacyAutofillAgent;
-
   // Flags passed to ShowSuggestions.
   struct ShowSuggestionsOptions {
     // All fields are default initialized to false.
     ShowSuggestionsOptions();
 
     // Specifies that suggestions should be shown when |element| contains no
     // text.
     bool autofill_on_empty_values;
 
     // Specifies that suggestions should be shown when the caret is not
@@ skipping 31 matching lines @@
   // submitted_forms_ contents to ensure no duplicate submissions of
   // AutofillHostMsg_WillSubmitForm.
   void FireHostSubmitEvents(const blink::WebFormElement& form,
                             bool form_submitted);
   void FireHostSubmitEvents(const FormData& form_data, bool form_submitted);
 
   // Shuts the AutofillAgent down on RenderFrame deletion. Safe to call multiple
   // times.
   void Shutdown();
 
-  // Pass-through from LegacyAutofillAgent. This correlates with the
-  // RenderViewObserver method.
-  void FocusChangeComplete();
-
   // PageClickListener:
   void FormControlElementClicked(const blink::WebFormControlElement& element,
                                  bool was_focused) override;
 
   // blink::WebAutofillClient:
   void TextFieldDidEndEditing(const blink::WebInputElement& element) override;
   void TextFieldDidChange(const blink::WebFormControlElement& element) override;
   void TextFieldDidReceiveKeyDown(
       const blink::WebInputElement& element,
       const blink::WebKeyboardEvent& event) override;
   void OpenTextDataListChooser(const blink::WebInputElement& element) override;
   void DataListOptionsChanged(const blink::WebInputElement& element) override;
   void UserGestureObserved() override;
   void AjaxSucceeded() override;
+  void DidCompleteFocusChangeInFrame() override;
+  void DidReceiveLeftMouseDownOrGestureTapInNode(
+      const blink::WebNode& node) override;
 
   // Called when a same-document navigation is detected.
   void OnSameDocumentNavigationCompleted();
   // Helper method which collects unowned elements (i.e., those not inside a
   // form tag) and writes them into |output|. Returns true if the process is
   // successful, and all conditions for firing events are true.
   bool CollectFormlessElements(FormData* output);
   FRIEND_TEST_ALL_PREFIXES(FormAutocompleteTest, CollectFormlessElements);
 
   // Called in a posted task by textFieldDidChange() to work-around a WebKit bug
@@ skipping 52 matching lines @@
   // frame.
   FormCache form_cache_;
 
   // Keeps track of the forms for which a "will submit" message has been sent in
   // this frame's current load. We use a simplified comparison function.
   std::set<FormData, FormDataCompare> submitted_forms_;
 
   PasswordAutofillAgent* password_autofill_agent_;  // Weak reference.
   PasswordGenerationAgent* password_generation_agent_;  // Weak reference.
 
-  // Passes through RenderViewObserver methods to |this|.
-  LegacyAutofillAgent legacy_;
-
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
   // The element corresponding to the last request sent for form field Autofill.
   blink::WebFormControlElement element_;
 
   // The form element currently requesting an interactive autocomplete.
   blink::WebFormElement in_flight_request_form_;
 
@@ skipping 16 matching lines @@
   // performance improvement, so that the IPC channel isn't flooded with
   // messages to close the Autofill popup when it can't possibly be showing.
   bool is_popup_possibly_visible_;
 
   // If the generation popup is possibly visible. This is tracked to prevent
   // generation UI from displaying at the same time as password manager UI.
   // This is needed because generation is shown on field focus vs. field click
   // for the password manager. TODO(gcasto): Have both UIs show on focus.
   bool is_generation_popup_possibly_visible_;
 
+  std::unique_ptr<PageClickTracker> page_click_tracker_;
+
   mojo::Binding<mojom::AutofillAgent> binding_;
 
   mojom::AutofillDriverPtr autofill_driver_;
 
   base::WeakPtrFactory<AutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_