Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/password_manager/chrome_password_manager_client.h

Index: chrome/browser/password_manager/chrome_password_manager_client.h
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index 93fd28d5a76715bed277473e0c92d0219cdd0641..634d8e192f71f3f20b62557bccd11ace464926ee 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -8,7 +8,8 @@
 #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.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"
@@ -28,7 +29,7 @@ class WebContents;
 namespace password_manager {
 struct CredentialInfo;
 class PasswordGenerationManager;
-class PasswordManager;
+class PasswordManagerDriver;
 }
 
 // ChromePasswordManagerClient implements the PasswordManagerClient interface.
@@ -63,7 +64,6 @@ class ChromePasswordManagerClient
       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(
@@ -72,6 +72,9 @@ class ChromePasswordManagerClient
   void LogSavePasswordProgress(const std::string& text) const override;
   bool IsLoggingActive() const override;
   bool WasLastNavigationHTTPError() const override;
+  bool DidLastPageLoadEncounterSSLErrors() override;
+  bool IsOffTheRecord() override;
+  password_manager::PasswordManager* GetPasswordManager() override;
 
   // Hides any visible generation UI.
   void HidePasswordGenerationPopup();
@@ -80,16 +83,6 @@ class ChromePasswordManagerClient
       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);
 
@@ -115,7 +108,8 @@ class ChromePasswordManagerClient
   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.
@@ -124,13 +118,15 @@ class ChromePasswordManagerClient
   // 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,
+  void ShowPasswordGenerationPopup(content::RenderFrameHost* render_frame_host,
+                                   const gfx::RectF& bounds,
                                    int max_length,
                                    const autofill::PasswordForm& form);
 
   // Causes the password editing UI to be shown anchored at |element_bounds|.
-  void ShowPasswordEditingPopup(
-      const gfx::RectF& bounds, const autofill::PasswordForm& form);
+  void ShowPasswordEditingPopup(content::RenderFrameHost* render_frame_host,
+                                const gfx::RectF& bounds,
+                                const autofill::PasswordForm& form);
 
   // Sends a message to the renderer with the current value of
   // |can_use_log_router_|.
@@ -149,7 +145,9 @@ class ChromePasswordManagerClient
 
   Profile* const profile_;
 
-  password_manager::ContentPasswordManagerDriver driver_;
+  password_manager::PasswordManager password_manager_;
+
+  password_manager::ContentPasswordManagerDriverFactory* driver_factory_;
 
   password_manager::ContentCredentialManagerDispatcher
       credential_manager_dispatcher_;