Switch AutofillManager to be UserData on WebContents.

chrome/browser/autofill/autofill_external_delegate_unittest.cc

 // 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.
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 45 matching lines @@
   MOCK_METHOD0(ClearPreviewedForm, void());
 
   MOCK_METHOD0(HideAutofillPopup, void());
 
  private:
   virtual void HideAutofillPopupInternal() {};
 };
 
 class MockAutofillManager : public AutofillManager {
  public:
-  explicit MockAutofillManager(autofill::AutofillManagerDelegate* delegate,
-                               TabContents* tab_contents)
+  explicit MockAutofillManager(content::WebContents* web_contents,
+                               autofill::AutofillManagerDelegate* delegate)
       // Force to use the constructor designated for unit test, but we don't
       // really need personal_data in this test so we pass a NULL pointer.
-      : AutofillManager(delegate, tab_contents, NULL) {
+      : AutofillManager(web_contents, delegate, NULL) {
   }
 
   MOCK_METHOD4(OnFillAutofillFormData,
                void(int query_id,
                     const webkit::forms::FormData& form,
                     const webkit::forms::FormField& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
 };
 
 }  // namespace
 
 class AutofillExternalDelegateUnitTest : public TabContentsTestHarness {
  public:
   AutofillExternalDelegateUnitTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
   virtual ~AutofillExternalDelegateUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
     TabContentsTestHarness::SetUp();
     TabAutofillManagerDelegate::CreateForWebContents(web_contents());
     autofill_manager_ = new MockAutofillManager(
-        TabAutofillManagerDelegate::FromWebContents(web_contents()),
-        tab_contents());
+        web_contents(),
+        TabAutofillManagerDelegate::FromWebContents(web_contents()));
     external_delegate_.reset(new MockAutofillExternalDelegate(
         tab_contents(),
         autofill_manager_));
   }
 
  protected:
   // Set up the expectation for a platform specific OnQuery call and then
   // execute it with the given QueryId.
   void IssueOnQuery(int query_id) {
     const FormData form;
@@ skipping 138 matching lines @@
   external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   external_delegate_->DidEndTextFieldEditing();
 }