Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/content_password_manager_driver.h

Index: chrome/browser/password_manager/content_password_manager_driver.h
diff --git a/chrome/browser/password_manager/content_password_manager_driver.h b/chrome/browser/password_manager/content_password_manager_driver.h
index 8ad20df573874ebe2e3a5390c3573ca31fbd06bb..68a503e8a4c380f9a2e48e518c5ba4ae04ad970d 100644
--- a/chrome/browser/password_manager/content_password_manager_driver.h
+++ b/chrome/browser/password_manager/content_password_manager_driver.h
@@ -7,6 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "chrome/browser/password_manager/password_generation_manager.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_driver.h"
 
 namespace content {
@@ -15,17 +17,26 @@ class WebContents;
 
 class ContentPasswordManagerDriver : public PasswordManagerDriver {
  public:
-  explicit ContentPasswordManagerDriver(content::WebContents* web_contents);
+  explicit ContentPasswordManagerDriver(content::WebContents* web_contents,
+                                        PasswordManagerDelegate* delegate);
   virtual ~ContentPasswordManagerDriver();
 
   // PasswordManagerDriver implementation.
-  virtual void FillPasswordForm(
-      const autofill::PasswordFormFillData& form_data) OVERRIDE;
+  virtual void FillPasswordForm(const autofill::PasswordFormFillData& form_data)
+      OVERRIDE;
   virtual bool DidLastPageLoadEncounterSSLErrors() OVERRIDE;
+  virtual PasswordGenerationManager* GetPasswordGenerationManager() OVERRIDE;
+  virtual PasswordManager* GetPasswordManager() OVERRIDE;
 
  private:
   content::WebContents* web_contents_;
 
+  // Must outlive this instance.
+  PasswordManagerDelegate* delegate_;
+
+  PasswordManager password_manager_;
+  PasswordGenerationManager password_generation_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentPasswordManagerDriver);
 };