Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/password_manager/chrome_password_manager_client.h

 // Copyright 2014 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 CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "components/password_manager/content/browser/content_credential_manager_dispatcher.h"
-#include "components/password_manager/content/browser/content_password_manager_driver.h"
+#include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ui/gfx/rect.h"
 
 class Profile;
 
 namespace autofill {
 class PasswordGenerationPopupObserver;
 class PasswordGenerationPopupControllerImpl;
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace password_manager {
 struct CredentialInfo;
 class PasswordGenerationManager;
 class PasswordManager;
+class PasswordManagerDriver;
 }
 
 // ChromePasswordManagerClient implements the PasswordManagerClient interface.
 class ChromePasswordManagerClient
     : public password_manager::PasswordManagerClient,
       public content::WebContentsObserver,
       public content::WebContentsUserData<ChromePasswordManagerClient> {
  public:
   ~ChromePasswordManagerClient() override;
 
   // PasswordManagerClient implementation.
   bool IsAutomaticPasswordSavingEnabled() const override;
   bool IsPasswordManagerEnabledForCurrentPage() const override;
   bool ShouldFilterAutofillResult(const autofill::PasswordForm& form) override;
   std::string GetSyncUsername() const override;
   bool IsSyncAccountCredential(const std::string& username,
                                const std::string& origin) const override;
   void AutofillResultsComputed() override;
   bool PromptUserToSavePassword(
       scoped_ptr<password_manager::PasswordFormManager> form_to_save) override;
   void AutomaticPasswordSave(scoped_ptr<password_manager::PasswordFormManager>
                                  saved_form_manager) override;
   void PasswordWasAutofilled(
       const autofill::PasswordFormMap& best_matches) const override;
   void PasswordAutofillWasBlocked(
       const autofill::PasswordFormMap& best_matches) const override;
   PrefService* GetPrefs() override;
   password_manager::PasswordStore* GetPasswordStore() override;
-  password_manager::PasswordManagerDriver* GetDriver() override;
   base::FieldTrial::Probability GetProbabilityForExperiment(
       const std::string& experiment_name) override;
   bool IsPasswordSyncEnabled(
       password_manager::CustomPassphraseState state) override;
   void OnLogRouterAvailabilityChanged(bool router_can_be_used) override;
   void LogSavePasswordProgress(const std::string& text) override;
   bool IsLoggingActive() const override;
+  // DEPRECATED

[vabr (Chromium), 2014/11/10 14:34:38]

nit: Further helpful information to put here:
* A link to a bug tracking removing this
* A hint to grab the driver for a frame instead.
* This driver is for the main frame.

[Evan Stade, 2014/11/14 23:25:49]

Done.

+  password_manager::PasswordManagerDriver* GetDriver() override;
 
   // Hides any visible generation UI.
   void HidePasswordGenerationPopup();
 
   static void CreateForWebContentsWithAutofillClient(
       content::WebContents* contents,
       autofill::AutofillClient* autofill_client);
 
-  // Convenience method to allow //chrome code easy access to a PasswordManager
-  // from a WebContents instance.
-  static password_manager::PasswordManager* GetManagerFromWebContents(
-      content::WebContents* contents);
-
-  // Convenience method to allow //chrome code easy access to a
-  // PasswordGenerationManager from a WebContents instance.
-  static password_manager::PasswordGenerationManager*
-      GetGenerationManagerFromWebContents(content::WebContents* contents);
-
   // Observer for PasswordGenerationPopup events. Used for testing.
   void SetTestObserver(autofill::PasswordGenerationPopupObserver* observer);
 
   // Returns true if the bubble UI is enabled, and false if we're still using
   // the sad old Infobar UI.
   static bool IsTheHotNewBubbleUIEnabled();
 
   // Returns true if the password manager should be enabled during sync signin.
   static bool EnabledForSyncSignin();
 
  protected:
   // Callable for tests.
   ChromePasswordManagerClient(content::WebContents* web_contents,
                               autofill::AutofillClient* autofill_client);
 
  private:
   enum AutofillForSyncCredentialsState {
     ALLOW_SYNC_CREDENTIALS,
     DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH,
     DISALLOW_SYNC_CREDENTIALS,
   };
 
   friend class content::WebContentsUserData<ChromePasswordManagerClient>;
 
   // content::WebContentsObserver overrides.
-  bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* render_frame_host) override;
 
   // Given |bounds| in the renderers coordinate system, return the same bounds
   // in the screens coordinate system.
   gfx::RectF GetBoundsInScreenSpace(const gfx::RectF& bounds);
 
   // Causes the password generation UI to be shown for the specified form.
   // The popup will be anchored at |element_bounds|. The generated password
   // will be no longer than |max_length|.
   void ShowPasswordGenerationPopup(const gfx::RectF& bounds,
                                    int max_length,
@@ skipping 13 matching lines @@
 
   // Returns true if |url| is the reauth page for accessing the password
   // website.
   bool IsURLPasswordWebsiteReauth(const GURL& url) const;
 
   // Sets |autofill_state_| based on experiment and flag values.
   void SetUpAutofillSyncState();
 
   Profile* const profile_;
 
-  password_manager::ContentPasswordManagerDriver driver_;
+  password_manager::ContentPasswordManagerDriverFactory driver_;
 
   password_manager::ContentCredentialManagerDispatcher
       credential_manager_dispatcher_;
 
   // Observer for password generation popup.
   autofill::PasswordGenerationPopupObserver* observer_;
 
   // Controls the popup
   base::WeakPtr<
     autofill::PasswordGenerationPopupControllerImpl> popup_controller_;
 
   // True if |this| is registered with some LogRouter which can accept logs.
   bool can_use_log_router_;
 
   // How to handle the sync credential in ShouldFilterAutofillResult().
   AutofillForSyncCredentialsState autofill_sync_state_;
 
   // If the sync credential was filtered during autofill. Used for statistics
   // reporting.
   bool sync_credential_was_filtered_;
 
+  // When non-NULL, the source of the current IPC message.

[vabr (Chromium), 2014/11/10 14:34:38]

nit: Maybe explicitly add that this is only non-NULL during OnMessageReceived?

[Evan Stade, 2014/11/14 23:25:49]

I think that's implied by "current IPC message"

+  content::RenderFrameHost* render_frame_host_source_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromePasswordManagerClient);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_