Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_manager_delegate_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
 
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_metrics_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-
 // SavePasswordInfoBarDelegate ------------------------------------------------
 
 // After a successful *new* login attempt, we take the PasswordFormManager in
 // provisional_save_manager_ and move it to a SavePasswordInfoBarDelegate while
 // the user makes up their mind with the "save password" infobar. Note if the
 // login is one we already know about, the end of the line is
 // provisional_save_manager_ because we just update it on success and so such
 // forms never end up in an infobar.
 class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
@@ skipping 162 matching lines @@
   return PASSWORD_INFOBAR;
 }
 
 
 // PasswordManagerDelegateImpl ------------------------------------------------
 
 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() {
 }
 
 void PasswordManagerDelegateImpl::AddSavePasswordInfoBarIfPermitted(
     PasswordFormManager* form_to_save) {
   std::string uma_histogram_suffix(
       password_manager_metrics_util::GroupIdToString(
           password_manager_metrics_util::MonitoredDomainGroupId(
               form_to_save->realm(), GetProfile()->GetPrefs())));
   SavePasswordInfoBarDelegate::Create(
       web_contents_, form_to_save, uma_histogram_suffix);
 }
 
 Profile* PasswordManagerDelegateImpl::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 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();
+}