Switch AutofillManager to be UserData on WebContents.

chrome/browser/ui/tab_contents/tab_contents.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_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class AutofillExternalDelegate;
-class AutofillManager;
 class BasePanelBrowserTest;
 class Browser;
 class BrowserCommandsTabContentsCreator;
 class BrowserLauncherItemControllerContentsCreator;
 class BrowserTabstripTabContentsCreator;
 class ChromeWebContentsHandler;
 class ConstrainedWebDialogDelegateBase;
 class ExtensionTabUtil;
 class ExternalTabContainerWin;
 class GeolocationPermissionContextTests;
@@ skipping 107 matching lines @@
   content::WebContents* web_contents() const;
 
   // Returns the Profile that is associated with this TabContents.
   Profile* profile() const;
 
   // True if this TabContents is being torn down.
   bool in_destructor() const { return in_destructor_; }
 
   // Tab Helpers ---------------------------------------------------------------
 
-  AutofillManager* autofill_manager() { return autofill_manager_.get(); }
-
   InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
 
   PasswordManager* password_manager() { return password_manager_.get(); }
 
   // NOTE: This returns NULL unless in-browser thumbnail generation is enabled.
   ThumbnailGenerator* thumbnail_generator() {
     return thumbnail_generator_.get();
   }
 
   // Overrides -----------------------------------------------------------------
 
   // content::WebContentsObserver overrides:
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
  private:
   friend class TabContentsFactory;
 
   // Takes ownership of |contents|, which must be heap-allocated (as it lives
   // in a scoped_ptr) and can not be NULL.
   explicit TabContents(content::WebContents* contents);
 
   // Create a TabContents with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
   TabContents* Clone();
 
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
 
-  scoped_refptr<AutofillManager> autofill_manager_;
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
   scoped_ptr<ThumbnailGenerator> thumbnail_generator_;
 
   // WebContents (MUST BE LAST) ------------------------------------------------
 
   // If true, we're running the destructor.
   bool in_destructor_;
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_