Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autofill_manager_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 17 matching lines @@
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/test_autofill_driver.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
 #include "components/autofill/core/browser/test_autofill_manager_delegate.h"
+#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.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/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_utils.h"
 #include "grit/component_strings.h"
@@ skipping 20 matching lines @@
 // an IPC message back to the renderer.
 const int kDefaultPageID = 137;
 
 class TestPersonalDataManager : public PersonalDataManager {
  public:
   TestPersonalDataManager() : PersonalDataManager("en-US") {
     CreateTestAutofillProfiles(&web_profiles_);
     CreateTestCreditCards(&credit_cards_);
   }
 
-  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]

nit: Why not just "using PersonalDataManager::set_autofill_webdata_service;"?

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

Done.

 
   void SetPrefService(PrefService* pref_service) {
     set_pref_service(pref_service);
   }
 
   // Factory method for keyed service.  PersonalDataManager is NULL for testing.
   static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
     return NULL;
   }
 
@@ skipping 542 matching lines @@
  public:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
     autofill::PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
         profile(), TestPersonalDataManager::Build);
 
 
     autofill::TabAutofillManagerDelegate::CreateForWebContents(web_contents());
 
-    personal_data_.SetBrowserContext(profile());
+    autofill::TabAutofillManagerDelegate* manager_delegate =
+        autofill::TabAutofillManagerDelegate::FromWebContents(web_contents());
+    personal_data_.SetAutofillWebDataService(
+        manager_delegate->GetAutofillWebDataService());
     personal_data_.SetPrefService(profile()->GetPrefs());
     autofill_driver_.reset(new MockAutofillDriver(web_contents()));
     autofill_manager_.reset(new TestAutofillManager(
-        autofill_driver_.get(),
-        autofill::TabAutofillManagerDelegate::FromWebContents(web_contents()),
-        &personal_data_));
+        autofill_driver_.get(), manager_delegate, &personal_data_));
 
     external_delegate_.reset(new TestAutofillExternalDelegate(
         web_contents(),
         autofill_manager_.get(),
         autofill_driver_.get()));
     autofill_manager_->SetExternalDelegate(external_delegate_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed. Also, a real
     // AutofillManager is tied to the lifetime of the WebContents, so it must
     // be destroyed at the destruction of the WebContents.
     autofill_manager_.reset();
     autofill_driver_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
 
-    // Remove the BrowserContext so TestPersonalDataManager does not need to
-    // care about removing self as an observer in destruction.
-    personal_data_.SetBrowserContext(NULL);
+    // Remove the AutofillWebDataService so TestPersonalDataManager does not
+    // need to care about removing self as an observer in destruction.
+    personal_data_.SetAutofillWebDataService(
+        scoped_refptr<AutofillWebDataService>(NULL));
   }
 
   void GetAutofillSuggestions(int query_id,
                               const FormData& form,
                               const FormFieldData& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
                                                 gfx::Rect(),
                                                 false);
@@ skipping 2268 matching lines @@
   test::CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormFieldData& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   EXPECT_TRUE(external_delegate_->on_query_seen());
 }
 
 }  // namespace autofill