Switch AutofillManager to be UserData on WebContents.

chrome/browser/autofill/autofill_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_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 18 matching lines @@
 #include "content/public/browser/web_contents_observer.h"
 
 class AutofillExternalDelegate;
 class AutofillField;
 class AutofillProfile;
 class AutofillMetrics;
 class CreditCard;
 class PersonalDataManager;
 class PrefService;
 class ProfileSyncService;
-class TabContents;
 
 struct ViewHostMsg_FrameNavigate_Params;
 
 namespace autofill {
 class AutofillManagerDelegate;
 class PasswordGenerator;
 }
 
 namespace content {
 class RenderViewHost;
+class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace webkit {
 namespace forms {
 struct FormData;
 struct FormField;
 struct PasswordForm;
 struct PasswordFormFillData;
 }
 }
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutofillManager : public content::NotificationObserver,
                         public content::WebContentsObserver,
                         public AutofillDownloadManager::Observer,
                         public ProfileSyncServiceObserver,
                         public base::RefCounted<AutofillManager> {
  public:
-  // Lifetime of |client| and |tab_contents| must exceed lifetime of
-  // AutofillManager.
-  explicit AutofillManager(autofill::AutofillManagerDelegate* delegate,
-                           TabContents* tab_contents);
+  static void CreateForWebContentsAndDelegate(
+      content::WebContents* contents,
+      autofill::AutofillManagerDelegate* delegate);
+  static AutofillManager* FromWebContents(content::WebContents* contents);
 
   // Registers our Enable/Disable Autofill pref.
   static void RegisterUserPrefs(PrefServiceBase* prefs);
 
   // Set our external delegate.
   // TODO(jrg): consider passing delegate into the ctor.  That won't
   // work if the delegate has a pointer to the AutofillManager, but
   // future directions may not need such a pointer.
   void SetExternalDelegate(AutofillExternalDelegate* delegate) {
     external_delegate_ = delegate;
@@ skipping 15 matching lines @@
                                      int max_length,
                                      const webkit::forms::PasswordForm& form);
 
   // Remove the credit card or Autofill profile that matches |unique_id|
   // from the database.
   void RemoveAutofillProfileOrCreditCard(int unique_id);
 
  protected:
   // Only test code should subclass AutofillManager.
   friend class base::RefCounted<AutofillManager>;
+
+  AutofillManager(content::WebContents* web_contents,
+                  autofill::AutofillManagerDelegate* delegate);
   virtual ~AutofillManager();
 
   // The string/int pair is composed of the guid string and variant index
   // respectively.  The variant index is an index into the multi-valued item
   // (where applicable).
   typedef std::pair<std::string, size_t> GUIDPair;
 
   // Test code should prefer to use this constructor.
-  AutofillManager(autofill::AutofillManagerDelegate* delegate,
-                  TabContents* tab_contents,
+  AutofillManager(content::WebContents* web_contents,
+                  autofill::AutofillManagerDelegate* delegate,
                   PersonalDataManager* personal_data);
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // Uploads the form data to the Autofill server.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
   // Reset cache.
   void Reset();
@@ skipping 185 matching lines @@
   void UpdateInitialInteractionTimestamp(
       const base::TimeTicks& interaction_timestamp);
 
   // Send our current field type predictions to the renderer. This is a no-op if
   // the appropriate command-line flag is not set.
   void SendAutofillTypePredictions(
       const std::vector<FormStructure*>& forms) const;
 
   autofill::AutofillManagerDelegate* const manager_delegate_;
 
-  // The owning TabContents.
-  TabContents* tab_contents_;
-
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutofillManagerTest.
   // Weak reference.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
   std::list<std::string> autofilled_form_signatures_;
   // Handles queries and uploads to Autofill servers.
   AutofillDownloadManager download_manager_;
 
@@ skipping 66 matching lines @@
                            TestTabContentsWithExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_