Parameterize the PrefService that AutofillDownloadManager uses.

chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc

Index: chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index 057f0a7eab45e939be705b9479292236f201eed9..f442d3c5f33696da6e6656b6e834f62fc2b2eb1a 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
@@ -56,8 +56,12 @@ class MockAutofillManagerDelegate
 
   virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
 
+  user_prefs::PrefRegistrySyncable* GetPrefRegistry() {
+    return prefs_.registry();
+  }
+
  private:
-  TestingPrefServiceSimple prefs_;
+  TestingPrefServiceSyncable prefs_;

[Ilya Sherman, 2013/11/05 00:17:04]

Hmm, why is this change needed here, but not for the autofill_download_unittest
file?

[blundell, 2013/11/05 15:26:54]

It's needed here because this test is using a manually-constructed PrefService
that didn't have AutofillManager::RegisterProfilePrefs() called on its registry,
causing DCHECKs to go off when AutofillDownloadManager uses this PrefService
[note that prior to the refactoring in this CL, AutofillDownloadManager was not
using the MockAutofillManagerDelegate's pref service in this test). In
autofill_download_unittest, the PrefService being used is that of the Profile,
which has had proper registration done for its registry.

Eventually similar changes will have to happen for the core autofill unit tests
in order to get them shared by iOS. I'm not focusing on these challenges as part
of this first pass of getting the core autofill code running cleanly on iOS.
When that time comes, it might make sense to make a helper method in
autofill_test_common that can give the client a PrefService whose registry has
had the Autofil prefs registered.

On 2013/11/05 00:17:04, Ilya Sherman wrote:

 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
 };
@@ -127,6 +131,8 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
+    AutofillManager::RegisterProfilePrefs(manager_delegate_->GetPrefRegistry());
+
     AutofillDriverImpl::CreateForWebContentsAndDelegate(
         web_contents(),
         manager_delegate_.get(),