Switch AutofillManager to be UserData on WebContents.

chrome/browser/autofill/autofill_manager_unittest.cc

Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 0a59cc6a9d46ee355e2c0b296c0e531fee0586fc..4612d15f8cab5172bd11c116bd636700e1d1b4cc 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -441,10 +441,10 @@ void ExpectFilledCreditCardYearMonthWithYearMonth(int page_id,
 
 class TestAutofillManager : public AutofillManager {
  public:
-  TestAutofillManager(autofill::AutofillManagerDelegate* delegate,
-                      TabContents* tab_contents,
+  TestAutofillManager(content::WebContents* web_contents,
+                      autofill::AutofillManagerDelegate* delegate,
                       TestPersonalDataManager* personal_data)
-      : AutofillManager(delegate, tab_contents, personal_data),
+      : AutofillManager(web_contents, delegate, personal_data),
         personal_data_(personal_data),
         autofill_enabled_(true),
         did_finish_async_form_submit_(false),
@@ -607,8 +607,8 @@ class AutofillManagerTest : public TabContentsTestHarness {
     TabContentsTestHarness::SetUp();
     TabAutofillManagerDelegate::CreateForWebContents(web_contents());
     autofill_manager_ = new TestAutofillManager(
+        web_contents(),
         TabAutofillManagerDelegate::FromWebContents(web_contents()),
-        tab_contents(),
         &personal_data_);
 
     file_thread_.Start();
@@ -3131,11 +3131,12 @@ TEST_F(AutofillManagerTest, TestTabContentsWithExternalDelegate) {
   WebContents* contents = CreateTestWebContents();
   SetContents(contents);
 
-  AutofillManager* autofill_manager = tab_contents()->autofill_manager();
+  AutofillManager* autofill_manager =
+      AutofillManager::FromWebContents(contents);
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
-      AutocompleteHistoryManager::FromWebContents(web_contents());
+      AutocompleteHistoryManager::FromWebContents(contents);
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }