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 f4ee7c40d995f8365b7658a508b1db3ad03da31e..acad494d4397cc6fef78fe7b9c4c131a8ef31411 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -4,13 +4,14 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/prefs/testing_pref_service.h"
+#include "base/prefs/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_profile.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
+#include "components/autofill/core/browser/autofill_common_test.h"

[Ilya Sherman, 2013/11/05 18:50:49]

nit: Completely orthogonal to your CL, but at some point we really should rename
this to something more like "autofill_test_common" or "autofill_test_utils",
since this file does not itself contain any test code.

[blundell, 2013/11/06 10:37:20]

Strongly agreed. Filed crbug.com/315492.

On 2013/11/05 18:50:49, Ilya Sherman wrote:

 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
@@ -53,13 +54,15 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
 class MockAutofillManagerDelegate
     : public autofill::TestAutofillManagerDelegate {
  public:
-  MockAutofillManagerDelegate() {}
+  MockAutofillManagerDelegate() :

[Ilya Sherman, 2013/11/05 18:50:49]

nit: The colon should wrap with the initializer list, so it should be where the
'p' from 'prefs_' currently is.

[blundell, 2013/11/06 10:37:20]

Done.

+      prefs_(autofill::test::PrefServiceForTesting().Pass()) {

[Ilya Sherman, 2013/11/05 18:50:49]

nit: I don't think ".Pass()" ought to be required here.  Does the code still
compile without it?

[blundell, 2013/11/06 10:37:20]

Done.

+  }
   virtual ~MockAutofillManagerDelegate() {}
 
-  virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
+  virtual PrefService* GetPrefs() OVERRIDE { return prefs_.get(); }
 
  private:
-  TestingPrefServiceSimple prefs_;
+  scoped_ptr<PrefService> prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
 };