1 files changed, 15 insertions, 13 deletions

diff --git a/src/core/autofill_client_qt.h b/src/core/autofill_client_qt.h
index 967c4b227..cd38de462 100644
--- a/src/core/autofill_client_qt.h
+++ b/src/core/autofill_client_qt.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "components/autofill/core/browser/autofill_client.h"
+#include "components/autofill/content/browser/content_autofill_client.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
@@ -30,13 +30,14 @@ namespace QtWebEngineCore {
 class AutofillPopupController;
 class WebContentsAdapterClient;
 
-class AutofillClientQt : public autofill::AutofillClient,
-                         public content::WebContentsUserData<AutofillClientQt>,
+class AutofillClientQt : public autofill::ContentAutofillClient,
                          public content::WebContentsObserver
 {
 public:
     ~AutofillClientQt() override;
 
+    static void CreateForWebContents(content::WebContents *contents);
+
     // autofill::AutofillClient overrides:
     autofill::PersonalDataManager *GetPersonalDataManager() override;
     autofill::AutocompleteHistoryManager *GetAutocompleteHistoryManager() override;
@@ -48,15 +49,19 @@ public:
     void UpdateAutofillPopupDataListValues(const std::vector<std::u16string> &values,
                                            const std::vector<std::u16string> &labels) override;
     void PinPopupView() override;
-    autofill::AutofillClient::PopupOpenArgs GetReopenPopupArgs() const override;
-    base::span<const autofill::Suggestion> GetPopupSuggestions() const override;
-    void UpdatePopup(const std::vector<autofill::Suggestion> &, autofill::PopupType) override;
+    PopupOpenArgs GetReopenPopupArgs(
+            autofill::AutofillSuggestionTriggerSource trigger_source) const override;
+    std::vector<autofill::Suggestion> GetPopupSuggestions() const override;
+    void UpdatePopup(const std::vector<autofill::Suggestion>& suggestions,
+                     autofill::PopupType popup_type,
+                     autofill::AutofillSuggestionTriggerSource trigger_source) override;
     void HideAutofillPopup(autofill::PopupHidingReason reason) override;
-    bool IsAutocompleteEnabled() override;
+    bool IsAutocompleteEnabled() const override;
     bool IsPasswordManagerEnabled() override;
-    void PropagateAutofillPredictions(content::RenderFrameHost *,
-                                      const std::vector<autofill::FormStructure *> &) override;
-
+    void PropagateAutofillPredictionsDeprecated(autofill::AutofillDriver *,
+                                                const std::vector<autofill::FormStructure *> &) override;
+    bool IsOffTheRecord() override;
+    scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
 
 private:
     explicit AutofillClientQt(content::WebContents *webContents);
@@ -64,9 +69,6 @@ private:
     WebContentsAdapterClient *adapterClient();
 
     QScopedPointer<AutofillPopupController> m_popupController;
-
-    WEB_CONTENTS_USER_DATA_KEY_DECL();
-    friend class content::WebContentsUserData<AutofillClientQt>;
 };
 
 } // namespace QtWebEngineCore