1 files changed, 10 insertions, 57 deletions

diff --git a/chromium/components/password_manager/content/browser/content_password_manager_driver.h b/chromium/components/password_manager/content/browser/content_password_manager_driver.h
index 7fe883b92c5..d2507515804 100644
--- a/chromium/components/password_manager/content/browser/content_password_manager_driver.h
+++ b/chromium/components/password_manager/content/browser/content_password_manager_driver.h
@@ -12,15 +12,13 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "components/autofill/content/common/autofill_agent.mojom.h"
-#include "components/autofill/content/common/autofill_driver.mojom.h"
 #include "components/autofill/core/common/password_form_field_prediction_map.h"
 #include "components/autofill/core/common/password_form_generation_data.h"
 #include "components/password_manager/core/browser/password_autofill_manager.h"
 #include "components/password_manager/core/browser/password_generation_manager.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/associated_binding.h"
 
 namespace autofill {
 struct PasswordForm;
@@ -36,9 +34,7 @@ enum class BadMessageReason;
 
 // There is one ContentPasswordManagerDriver per RenderFrameHost.
 // The lifetime is managed by the ContentPasswordManagerDriverFactory.
-class ContentPasswordManagerDriver
-    : public PasswordManagerDriver,
-      public autofill::mojom::PasswordManagerDriver {
+class ContentPasswordManagerDriver : public PasswordManagerDriver {
  public:
   ContentPasswordManagerDriver(content::RenderFrameHost* render_frame_host,
                                PasswordManagerClient* client,
@@ -49,8 +45,6 @@ class ContentPasswordManagerDriver
   static ContentPasswordManagerDriver* GetForRenderFrameHost(
       content::RenderFrameHost* render_frame_host);
 
-  void BindRequest(autofill::mojom::PasswordManagerDriverRequest request);
-
   // PasswordManagerDriver implementation.
   void FillPasswordForm(
       const autofill::PasswordFormFillData& form_data) override;
@@ -63,66 +57,31 @@ class ContentPasswordManagerDriver
                      autofill::PasswordFormFieldPredictionMap>& predictions)
       override;
   void GeneratedPasswordAccepted(const base::string16& password) override;
-  void UserSelectedManualGenerationOption() override;
   void FillSuggestion(const base::string16& username,
                       const base::string16& password) override;
+  void FillIntoFocusedField(bool is_password,
+                            const base::string16& credential,
+                            base::OnceCallback<void(autofill::FillingStatus)>
+                                compeleted_callback) override;
   void PreviewSuggestion(const base::string16& username,
                          const base::string16& password) override;
   void ShowInitialPasswordAccountSuggestions(
       const autofill::PasswordFormFillData& form_data) override;
   void ClearPreviewedForm() override;
   void ForceSavePassword() override;
-  void ShowManualFallbackForSaving(const autofill::PasswordForm& form) override;
-  void HideManualFallbackForSaving() override;
   void GeneratePassword() override;
+  PasswordGenerationManager* GetPasswordGenerationManager() override;
+  PasswordManager* GetPasswordManager() override;
+  PasswordAutofillManager* GetPasswordAutofillManager() override;
   void SendLoggingAvailability() override;
   void AllowToRunFormClassifier() override;
   autofill::AutofillDriver* GetAutofillDriver() override;
   bool IsMainFrame() const override;
-  void MatchingBlacklistedFormFound() override;
-
-  PasswordGenerationManager* GetPasswordGenerationManager() override;
-  PasswordManager* GetPasswordManager() override;
-  PasswordAutofillManager* GetPasswordAutofillManager() override;
 
   void DidNavigateFrame(content::NavigationHandle* navigation_handle);
 
-  // autofill::mojom::PasswordManagerDriver:
-  void PasswordFormsParsed(
-      const std::vector<autofill::PasswordForm>& forms) override;
-  void PasswordFormsRendered(
-      const std::vector<autofill::PasswordForm>& visible_forms,
-      bool did_stop_loading) override;
-  void PasswordFormSubmitted(
-      const autofill::PasswordForm& password_form) override;
-  void SameDocumentNavigation(
-      const autofill::PasswordForm& password_form) override;
-  void PresaveGeneratedPassword(
-      const autofill::PasswordForm& password_form) override;
-  void PasswordNoLongerGenerated(
-      const autofill::PasswordForm& password_form) override;
-  void ShowPasswordSuggestions(int key,
-                               base::i18n::TextDirection text_direction,
-                               const base::string16& typed_username,
-                               int options,
-                               const gfx::RectF& bounds) override;
-  void ShowManualFallbackSuggestion(base::i18n::TextDirection text_direction,
-                                    const gfx::RectF& bounds) override;
-  void RecordSavePasswordProgress(const std::string& log) override;
-  void UserModifiedPasswordField() override;
-  void SaveGenerationFieldDetectedByClassifier(
-      const autofill::PasswordForm& password_form,
-      const base::string16& generation_field) override;
-  void CheckSafeBrowsingReputation(const GURL& form_action,
-                                   const GURL& frame_url) override;
-
-  void OnPasswordFormsParsedNoRenderCheck(
-      const std::vector<autofill::PasswordForm>& forms);
-  void OnFocusedPasswordFormFound(const autofill::PasswordForm& password_form);
-
  private:
-  bool CheckChildProcessSecurityPolicy(const GURL& url,
-                                       BadMessageReason reason);
+  void OnFocusedPasswordFormFound(const autofill::PasswordForm& password_form);
 
   const autofill::mojom::AutofillAgentPtr& GetAutofillAgent();
 
@@ -131,9 +90,6 @@ class ContentPasswordManagerDriver
   const autofill::mojom::PasswordGenerationAgentPtr&
   GetPasswordGenerationAgent();
 
-  gfx::RectF TransformToRootCoordinates(
-      const gfx::RectF& bounds_in_frame_coordinates);
-
   // Returns the next key to be used for PasswordFormFillData sent to
   // PasswordAutofillManager and PasswordAutofillAgent.
   int GetNextKey();
@@ -160,9 +116,6 @@ class ContentPasswordManagerDriver
 
   autofill::mojom::PasswordGenerationAgentPtr password_gen_agent_;
 
-  mojo::Binding<autofill::mojom::PasswordManagerDriver>
-      password_manager_binding_;
-
   base::WeakPtrFactory<ContentPasswordManagerDriver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentPasswordManagerDriver);