Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_generation_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_GENERATION_MANAGER_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_GENERATION_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ui/gfx/rect.h"
 
+class PasswordManager;
+class PasswordManagerDelegate;
+class PasswordManagerDriver;
+
 namespace autofill {
 struct FormData;
 class FormStructure;
 class PasswordGenerator;
 class PasswordGenerationPopupControllerImpl;
 class PasswordGenerationPopupObserver;
 struct PasswordForm;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // Per-tab manager for password generation. Will enable this feature only if
 //
 // -  Password manager is enabled
 // -  Password sync is enabled
 //
 // NOTE: At the moment, the creation of the renderer PasswordGenerationManager
 // is controlled by a switch (--enable-password-generation) so this feature will
 // not be enabled regardless of the above criteria without the switch being
 // present.
 //
 // This class is used to determine what forms we should offer to generate
 // passwords for and manages the popup which is created if the user chooses to
 // generate a password.
-class PasswordGenerationManager
-    : public content::WebContentsObserver,
-      public content::WebContentsUserData<PasswordGenerationManager> {
+class PasswordGenerationManager : public content::WebContentsObserver {
  public:
+  PasswordGenerationManager(content::WebContents* contents,
+                            PasswordManagerDelegate* delegate);
   virtual ~PasswordGenerationManager();
 
   // Detect account creation forms from forms with autofill type annotated.
   // Will send a message to the renderer if we find a correctly annotated form
   // and the feature is enabled.
   void DetectAccountCreationForms(
       const std::vector<autofill::FormStructure*>& forms);
 
   // Hide any visible password generation related popups.
   void HidePopup();
 
   // Observer for PasswordGenerationPopup events. Used for testing.
   void SetTestObserver(autofill::PasswordGenerationPopupObserver* observer);
 
- protected:
-  explicit PasswordGenerationManager(content::WebContents* contents);
-
  private:
-  friend class content::WebContentsUserData<PasswordGenerationManager>;
   friend class PasswordGenerationManagerTest;
 
   // WebContentsObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Determines current state of password generation
   bool IsGenerationEnabled() const;
 
   // Sends a message to the renderer specifying form(s) that we should enable
   // password generation on. This is a separate function to aid in testing.
@@ skipping 21 matching lines @@
   // Observer for password generation popup.
   autofill::PasswordGenerationPopupObserver* observer_;
 
   // Controls how passwords are generated.
   scoped_ptr<autofill::PasswordGenerator> password_generator_;
 
   // Controls the popup
   base::WeakPtr<
     autofill::PasswordGenerationPopupControllerImpl> popup_controller_;
 
+  // The PasswordManagerDelegate instance associated with this instance. Must
+  // outlive this instance.
+  PasswordManagerDelegate* delegate_;
+
+  // The PasswordManagerDriver instance associated with this instance. Must
+  // outlive this instance.
+  PasswordManagerDriver* driver_;
+
   DISALLOW_COPY_AND_ASSIGN(PasswordGenerationManager);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_GENERATION_MANAGER_H_