Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autofill_metrics_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_metrics.h"
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/test_autofill_driver.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/forms_seen_state.h"
 #include "components/webdata/common/web_data_results.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
@@ skipping 52 matching lines @@
 
 class TestPersonalDataManager : public PersonalDataManager {
  public:
   TestPersonalDataManager()
       : PersonalDataManager("en-US"),
         autofill_enabled_(true) {
     set_metric_logger(new testing::NiceMock<MockAutofillMetrics>());
     CreateTestAutofillProfiles(&web_profiles_);
   }
 
-  void SetBrowserContext(content::BrowserContext* context) {
-    set_browser_context(context);
+  void SetAutofillWebDataService(
+      scoped_refptr<AutofillWebDataService> webdata) {
+    set_autofill_webdata_service(webdata);

[Ilya Sherman, 2013/11/14 02:22:02]

Ditto here.

[blundell, 2013/11/14 16:46:30]

Done.

   }
 
   void SetPrefService(PrefService* pref_service) {
     set_pref_service(pref_service);
   }
 
   // Overridden to avoid a trip to the database. This should be a no-op except
   // for the side-effect of logging the profile count.
   virtual void LoadProfiles() OVERRIDE {
     std::vector<AutofillProfile*> profiles;
@@ skipping 172 matching lines @@
 
 void AutofillMetricsTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Ensure Mac OS X does not pop up a modal dialog for the Address Book.
   autofill::test::DisableSystemServices(profile());
 
   PersonalDataManagerFactory::GetInstance()->SetTestingFactory(profile(), NULL);
 
   TabAutofillManagerDelegate::CreateForWebContents(web_contents());
+  autofill::TabAutofillManagerDelegate* manager_delegate =
+      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents());
 
   personal_data_.reset(new TestPersonalDataManager());
-  personal_data_->SetBrowserContext(profile());
+  personal_data_->SetAutofillWebDataService(
+      manager_delegate->GetAutofillWebDataService());
   personal_data_->SetPrefService(profile()->GetPrefs());
   autofill_driver_.reset(new TestAutofillDriver(web_contents()));
   autofill_manager_.reset(new TestAutofillManager(
-      autofill_driver_.get(),
-      TabAutofillManagerDelegate::FromWebContents(web_contents()),
-      personal_data_.get()));
+      autofill_driver_.get(), manager_delegate, personal_data_.get()));
 
   external_delegate_.reset(new AutofillExternalDelegate(
       web_contents(),
       autofill_manager_.get(),
       autofill_driver_.get()));
   autofill_manager_->SetExternalDelegate(external_delegate_.get());
 }
 
 void AutofillMetricsTest::TearDown() {
   // Order of destruction is important as AutofillManager relies on
@@ skipping 692 matching lines @@
   EXPECT_CALL(*personal_data_->metric_logger(),
               LogStoredProfileCount(::testing::_)).Times(0);
   personal_data_->LoadProfiles();
 }
 
 // Test that we correctly log when Autofill is enabled.
 TEST_F(AutofillMetricsTest, AutofillIsEnabledAtStartup) {
   personal_data_->set_autofill_enabled(true);
   EXPECT_CALL(*personal_data_->metric_logger(),
               LogIsAutofillEnabledAtStartup(true)).Times(1);
-  personal_data_->Init(profile(),
+  autofill::TabAutofillManagerDelegate* manager_delegate =
+      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents());
+  personal_data_->Init(manager_delegate->GetAutofillWebDataService(),
                        profile()->GetPrefs(),
                        profile()->IsOffTheRecord());
 }
 
 // Test that we correctly log when Autofill is disabled.
 TEST_F(AutofillMetricsTest, AutofillIsDisabledAtStartup) {
   personal_data_->set_autofill_enabled(false);
   EXPECT_CALL(*personal_data_->metric_logger(),
               LogIsAutofillEnabledAtStartup(false)).Times(1);
-  personal_data_->Init(profile(),
+  autofill::TabAutofillManagerDelegate* manager_delegate =
+      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents());
+  personal_data_->Init(manager_delegate->GetAutofillWebDataService(),
                        profile()->GetPrefs(),
                        profile()->IsOffTheRecord());
 }
 
 // Test that we log the number of Autofill suggestions when filling a form.
 TEST_F(AutofillMetricsTest, AddressSuggestionsCount) {
   // Set up our form data.
   FormData form;
   form.name = ASCIIToUTF16("TestForm");
   form.method = ASCIIToUTF16("POST");
@@ skipping 523 matching lines @@
         TimeTicks::FromInternalValue(5));
     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());
   }
 }
 
 }  // namespace autofill