Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_manager_delegate_impl.cc

Index: chrome/browser/password_manager/password_manager_delegate_impl.cc
diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc
index 9ac3294fae072deae49aee0d604c3ac1c356d51e..5f99a7f5b79e8a5c6fd5e2dcc774db754f35d438 100644
--- a/chrome/browser/password_manager/password_manager_delegate_impl.cc
+++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc
@@ -25,7 +25,6 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-
 // SavePasswordInfoBarDelegate ------------------------------------------------
 
 // After a successful *new* login attempt, we take the PasswordFormManager in
@@ -208,9 +207,7 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(PasswordManagerDelegateImpl);
 
 PasswordManagerDelegateImpl::PasswordManagerDelegateImpl(
     content::WebContents* web_contents)
-    : web_contents_(web_contents),
-      driver_(web_contents) {
-}
+    : web_contents_(web_contents), driver_(web_contents, this) {}
 
 PasswordManagerDelegateImpl::~PasswordManagerDelegateImpl() {
 }
@@ -232,3 +229,24 @@ Profile* PasswordManagerDelegateImpl::GetProfile() {
 PasswordManagerDriver* PasswordManagerDelegateImpl::GetDriver() {
   return &driver_;
 }
+
+// static
+PasswordGenerationManager*
+PasswordManagerDelegateImpl::GetGenerationManagerFromWebContents(
+    content::WebContents* contents) {
+  PasswordManagerDelegateImpl* delegate =
+      PasswordManagerDelegateImpl::FromWebContents(contents);
+  if (!delegate)
+    return NULL;
+  return delegate->GetDriver()->GetPasswordGenerationManager();
+}
+
+// static
+PasswordManager* PasswordManagerDelegateImpl::GetManagerFromWebContents(
+    content::WebContents* contents) {
+  PasswordManagerDelegateImpl* delegate =
+      PasswordManagerDelegateImpl::FromWebContents(contents);
+  if (!delegate)
+    return NULL;
+  return delegate->GetDriver()->GetPasswordManager();
+}