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 1cd35819d2a278421b1b0bf6961c1cfac4dfc865..03e9edcbd8f7c2f1ce1c4982244f9b41e8b4d697 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.
@@ -57,7 +58,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(
@@ -65,6 +65,9 @@ class ChromePasswordManagerClient
   void OnLogRouterAvailabilityChanged(bool router_can_be_used) override;
   void LogSavePasswordProgress(const std::string& text) override;
   bool IsLoggingActive() const override;
+  bool DidLastPageLoadEncounterSSLErrors() override;
+  bool IsOffTheRecord() override;
+  password_manager::PasswordManager* GetPasswordManager() override;
 
   // Hides any visible generation UI.
   void HidePasswordGenerationPopup();
@@ -73,16 +76,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);
 
@@ -108,7 +101,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.
@@ -142,7 +136,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_;
@@ -164,6 +160,9 @@ class ChromePasswordManagerClient
   // reporting.
   bool sync_credential_was_filtered_;
 
+  // When non-NULL, the source of the current IPC message.
+  content::RenderFrameHost* render_frame_host_source_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromePasswordManagerClient);
 };