Eliminate AutofillExternalDelegate being a WebContentsUserData

components/autofill/browser/autofill_external_delegate.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 COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/autofill/browser/autofill_popup_delegate.h"
 #include "components/autofill/browser/password_autofill_manager.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/password_form_fill_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/web_contents_user_data.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
+class RenderViewHost;
 class WebContents;
 }
 
 namespace autofill {
 
 class AutofillManager;
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
 // Once Autofill is moved out of WebKit this class should be the only home for
 // this logic. See http://crbug.com/51644
 
 // Delegate for in-browser Autocomplete and Autofill display and selection.
 class AutofillExternalDelegate
-    : public content::WebContentsUserData<AutofillExternalDelegate>,
-      public content::NotificationObserver,
+    : public content::NotificationObserver,
       public AutofillPopupDelegate {
  public:
-  // Creates an AutofillExternalDelegate and attaches it to the specified
-  // contents; the second argument is an AutofillManager managing Autofill for
-  // that WebContents.
-  static void CreateForWebContentsAndManager(content::WebContents* web_contents,
-                                             AutofillManager* autofill_manager);
+  // Creates an AutofillExternalDelegate for the specified contents; the second
+  // argument is an AutofillManager managing Autofill for that WebContents.
+  AutofillExternalDelegate(content::WebContents* web_contents,
+                           AutofillManager* autofill_manager);
+  virtual ~AutofillExternalDelegate();
 
   // AutofillPopupDelegate implementation.
   virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE;
   virtual void OnPopupHidden(content::KeyboardListener* listener) OVERRIDE;
   virtual void DidSelectSuggestion(int identifier) OVERRIDE;
   virtual void DidAcceptSuggestion(const base::string16& value,
                                    int identifier) OVERRIDE;
   virtual void RemoveSuggestion(const base::string16& value,
                                 int identifier) OVERRIDE;
   virtual void ClearPreviewedForm() OVERRIDE;
@@ skipping 39 matching lines @@
   // Returns the delegate to its starting state by removing any page specific
   // values or settings.
   void Reset();
 
   // Inform the Password Manager of a filled form.
   void AddPasswordFormMapping(
       const FormFieldData& form,
       const PasswordFormFillData& fill_data);
 
  protected:
-  friend class content::WebContentsUserData<AutofillExternalDelegate>;
-  AutofillExternalDelegate(content::WebContents* web_contents,
-                           AutofillManager* autofill_manager);
-  virtual ~AutofillExternalDelegate();
-
   content::WebContents* web_contents() { return web_contents_; }
 
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr();
 
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
@@ skipping 66 matching lines @@
   std::vector<int> data_list_unique_ids_;
 
   base::WeakPtrFactory<AutofillExternalDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_