Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/content_password_manager_driver.cc

Index: chrome/browser/password_manager/content_password_manager_driver.cc
diff --git a/chrome/browser/password_manager/content_password_manager_driver.cc b/chrome/browser/password_manager/content_password_manager_driver.cc
index f8716c56dc6434debff7120576dc836b67912c7d..4fbf61e6c5d57e0b4f17fbf71f913df283634dde 100644
--- a/chrome/browser/password_manager/content_password_manager_driver.cc
+++ b/chrome/browser/password_manager/content_password_manager_driver.cc
@@ -15,19 +15,18 @@
 #include "net/cert/cert_status_flags.h"
 
 ContentPasswordManagerDriver::ContentPasswordManagerDriver(
-    content::WebContents* web_contents)
-    : web_contents_(web_contents) {
-}
+    content::WebContents* web_contents,
+    PasswordManagerDelegate* delegate)
+    : web_contents_(web_contents),
+      password_manager_(web_contents, delegate),
+      password_generation_manager_(web_contents, delegate) {}
 
-ContentPasswordManagerDriver::~ContentPasswordManagerDriver() {
-}
+ContentPasswordManagerDriver::~ContentPasswordManagerDriver() {}
 
 void ContentPasswordManagerDriver::FillPasswordForm(
     const autofill::PasswordFormFillData& form_data) {
-  web_contents_->GetRenderViewHost()->Send(
-      new AutofillMsg_FillPasswordForm(
-          web_contents_->GetRenderViewHost()->GetRoutingID(),
-          form_data));
+  web_contents_->GetRenderViewHost()->Send(new AutofillMsg_FillPasswordForm(
+      web_contents_->GetRenderViewHost()->GetRoutingID(), form_data));
 }
 
 bool ContentPasswordManagerDriver::DidLastPageLoadEncounterSSLErrors() {
@@ -40,3 +39,12 @@ bool ContentPasswordManagerDriver::DidLastPageLoadEncounterSSLErrors() {
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }
+
+PasswordGenerationManager*
+ContentPasswordManagerDriver::GetPasswordGenerationManager() {
+  return &password_generation_manager_;
+}
+
+PasswordManager* ContentPasswordManagerDriver::GetPasswordManager() {
+  return &password_manager_;
+}