Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

chrome/browser/extensions/test_extension_prefs.h

Index: chrome/browser/extensions/test_extension_prefs.h
diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h
index cb723b23e6c6de47368a5bf4376d19a60da4d8ef..f1e84dd8296b2dca0e9acde943707ff9a146f4f1 100644
--- a/chrome/browser/extensions/test_extension_prefs.h
+++ b/chrome/browser/extensions/test_extension_prefs.h
@@ -15,7 +15,7 @@
 class DictionaryValue;
 class ExtensionPrefs;
 class PrefService;
-
+class Profile;
 
 // This is a test class intended to make it easier to work with ExtensionPrefs
 // in tests.
@@ -25,7 +25,7 @@ class TestExtensionPrefs {
   virtual ~TestExtensionPrefs();
 
   ExtensionPrefs* prefs() { return prefs_.get(); }
-  PrefService* pref_service() { return pref_service_.get(); }
+  PrefService* pref_service() { return pref_service_; }
   const FilePath& temp_dir() const { return temp_dir_.path(); }
 
   // This will cause the ExtensionPrefs to be deleted and recreated, based on
@@ -49,8 +49,9 @@ class TestExtensionPrefs {
   ScopedTempDir temp_dir_;
   FilePath preferences_file_;
   FilePath extensions_dir_;
-  scoped_ptr<PrefService> pref_service_;
+  PrefService* pref_service_;  // Weak pointer, owned by profile_.
   scoped_ptr<ExtensionPrefs> prefs_;
+  scoped_ptr<Profile> profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);