Move ownership of Password(Generation)Manager to ContentPasswordDriver.

chrome/browser/password_manager/password_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/ui/login/login_model.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "content/public/browser/web_contents_user_data.h"
 
 class PasswordManagerDelegate;
 class PasswordManagerDriver;
 class PasswordManagerTest;
 class PasswordFormManager;
 class PrefRegistrySimple;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // Per-tab password manager. Handles creation and management of UI elements,
 // receiving password form data from the renderer and managing the password
 // database through the PasswordStore. The PasswordManager is a LoginModel
 // for purposes of supporting HTTP authentication dialogs.
-class PasswordManager : public LoginModel,
-                        public content::WebContentsObserver,
-                        public content::WebContentsUserData<PasswordManager> {
+class PasswordManager : public LoginModel, public content::WebContentsObserver {
  public:
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 #if defined(OS_WIN)
   static void RegisterLocalPrefs(PrefRegistrySimple* registry);
 #endif
-  static void CreateForWebContentsAndDelegate(
-      content::WebContents* contents,
-      PasswordManagerDelegate* delegate);
+  PasswordManager(content::WebContents* web_contents,
+                  PasswordManagerDelegate* delegate);
   virtual ~PasswordManager();
 
   typedef base::Callback<void(const autofill::PasswordForm&)>
       PasswordSubmittedCallback;
 
   // There is no corresponding remove function as currently all of the
   // owners of these callbacks have sufficient lifetimes so that the callbacks
   // should always be valid when called.
   void AddSubmissionCallback(const PasswordSubmittedCallback& callback);
 
@@ skipping 30 matching lines @@
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
   void OnPasswordFormsParsed(
       const std::vector<autofill::PasswordForm>& forms);
   void OnPasswordFormsRendered(
       const std::vector<autofill::PasswordForm>& visible_forms);
 
  protected:
-  // Subclassed for unit tests.
-  PasswordManager(content::WebContents* web_contents,
-                  PasswordManagerDelegate* delegate);
 
   // Handle notification that a password form was submitted.
   virtual void OnPasswordFormSubmitted(
       const autofill::PasswordForm& password_form);
 
  private:
-  friend class content::WebContentsUserData<PasswordManager>;
-
   enum ProvisionalSaveFailure {
     SAVING_DISABLED,
     EMPTY_PASSWORD,
     NO_MATCHING_FORM,
     MATCHING_NOT_COMPLETE,
     FORM_BLACKLISTED,
     INVALID_FORM,
     AUTOCOMPLETE_OFF,
     MAX_FAILURE_VALUE
   };
@@ skipping 58 matching lines @@
   // notification in const member functions.
   mutable ObserverList<LoginModelObserver> observers_;
 
   // Callbacks to be notified when a password form has been submitted.
   std::vector<PasswordSubmittedCallback> submission_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManager);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_