Switch AutofillManager to be UserData on WebContents.

chrome/browser/autofill/autofill_metrics_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/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 156 matching lines @@
     server_experiment_id_ = server_experiment_id;
   }
 
  private:
   std::string server_experiment_id_;
   DISALLOW_COPY_AND_ASSIGN(TestFormStructure);
 };
 
 class TestAutofillManager : public AutofillManager {
  public:
-  TestAutofillManager(autofill::AutofillManagerDelegate* manager_delegate,
-                      TabContents* tab_contents,
+  TestAutofillManager(content::WebContents* web_contents,
+                      autofill::AutofillManagerDelegate* manager_delegate,
                       TestPersonalDataManager* personal_manager)
-      : AutofillManager(manager_delegate, tab_contents, personal_manager),
+      : AutofillManager(web_contents, manager_delegate, personal_manager),
         autofill_enabled_(true),
         did_finish_async_form_submit_(false),
         message_loop_is_running_(false) {
     set_metric_logger(new MockAutofillMetrics);
   }
 
   virtual bool IsAutofillEnabled() const { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ skipping 102 matching lines @@
 
 void AutofillMetricsTest::SetUp() {
   Profile* profile = new TestingProfile();
   browser_context_.reset(profile);
   PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
       profile, NULL);
 
   TabContentsTestHarness::SetUp();
   TabAutofillManagerDelegate::CreateForWebContents(web_contents());
   autofill_manager_ = new TestAutofillManager(
+      web_contents(),
       TabAutofillManagerDelegate::FromWebContents(web_contents()),
-      tab_contents(),
       &personal_data_);
 
   file_thread_.Start();
 }
 
 void AutofillMetricsTest::TearDown() {
   file_thread_.Stop();
   TabContentsTestHarness::TearDown();
 }
 
@@ skipping 1153 matching lines @@
     autofill_manager_->OnTextFieldDidChange(form, form.fields.front(),
                                             TimeTicks::FromInternalValue(3));
     autofill_manager_->FormSubmitted(form, TimeTicks::FromInternalValue(17));
     autofill_manager_->Reset();
     Mock::VerifyAndClearExpectations(autofill_manager_->metric_logger());
   }
 
   // Restore the global Gmock verbosity level to its default value.
   ::testing::FLAGS_gmock_verbose = "warning";
 }