Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_generation_manager.cc

 // Copyright 2013 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_generation_manager.h"
 
 #include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/password_manager/password_manager_delegate.h"
+#include "chrome/browser/password_manager/password_manager_driver.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/rect.h"
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(PasswordGenerationManager);
-
 PasswordGenerationManager::PasswordGenerationManager(
-    content::WebContents* contents)
+    content::WebContents* contents,
+    PasswordManagerDelegate* delegate)
     : content::WebContentsObserver(contents),
-      observer_(NULL) {}
+      observer_(NULL),
+      delegate_(delegate),
+      driver_(delegate->GetDriver()) {}
 
 PasswordGenerationManager::~PasswordGenerationManager() {}
 
 void PasswordGenerationManager::SetTestObserver(
     autofill::PasswordGenerationPopupObserver* observer) {
   observer_ = observer;
 }
 
 void PasswordGenerationManager::DetectAccountCreationForms(
     const std::vector<autofill::FormStructure*>& forms) {
@@ skipping 34 matching lines @@
 // In order for password generation to be enabled, we need to make sure:
 // (1) Password sync is enabled, and
 // (2) Password saving is enabled.
 bool PasswordGenerationManager::IsGenerationEnabled() const {
   if (!web_contents())
     return false;
 
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
 
-  if (!PasswordManager::FromWebContents(web_contents())->IsSavingEnabled()) {
+  if (!driver_->GetPasswordManager()->IsSavingEnabled()) {
     DVLOG(2) << "Generation disabled because password saving is disabled";
     return false;
   }
 
   bool password_sync_enabled = false;
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   if (sync_service) {
     syncer::ModelTypeSet sync_set = sync_service->GetActiveDataTypes();
     password_sync_enabled = (sync_service->HasSyncSetupCompleted() &&
@@ skipping 18 matching lines @@
     const gfx::RectF& bounds) {
   gfx::Rect client_area;
   web_contents()->GetView()->GetContainerBounds(&client_area);
   return bounds + client_area.OffsetFromOrigin();
 }
 
 void PasswordGenerationManager::OnShowPasswordGenerationPopup(
     const gfx::RectF& bounds,
     int max_length,
     const autofill::PasswordForm& form) {
+// TODO(blundell): Should this short-circuit out if web_contents() is NULL?

[Garrett Casto, 2014/02/04 12:53:36]

Won't web_contents_ always be valid if this object exists? 

[blundell, 2014/02/04 13:16:18]

There is a period of time for WCO's when web_contents() is NULL but the
WebContents hasn't yet been destroyed (it's when the WebContents is in its
destructor). However, I now noticed that we're calling web_contents()->GetView()
below, so the code already assumes we're not in that situation.

On 2014/02/04 12:53:36, Garrett Casto wrote:

+
   // TODO(gcasto): Validate data in PasswordForm.
 
   // Only implemented for Aura right now.
 #if defined(USE_AURA)
   // Convert element_bounds to be in screen space.
   gfx::RectF element_bounds_in_screen_space = GetBoundsInScreenSpace(bounds);
 
   password_generator_.reset(new autofill::PasswordGenerator(max_length));
 
   popup_controller_ =
       autofill::PasswordGenerationPopupControllerImpl::GetOrCreate(
           popup_controller_,
           element_bounds_in_screen_space,
           form,
           password_generator_.get(),
-          PasswordManager::FromWebContents(web_contents()),
+          driver_->GetPasswordManager(),
           observer_,
           web_contents(),
           web_contents()->GetView()->GetNativeView());
   popup_controller_->Show();
 #endif  // #if defined(USE_AURA)
 }
 
 void PasswordGenerationManager::OnShowPasswordEditingPopup(
     const gfx::RectF& bounds) {
   // TODO(gcasto): Enable this.
 }
 
 void PasswordGenerationManager::OnHidePasswordGenerationPopup() {
   HidePopup();
 }
 
 void PasswordGenerationManager::HidePopup() {
   if (popup_controller_)
     popup_controller_->HideAndDestroy();
 }