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

chrome/test/testing_pref_service.cc

Index: chrome/test/testing_pref_service.cc
diff --git a/chrome/test/testing_pref_service.cc b/chrome/test/testing_pref_service.cc
index f6ca03abd159205d2b2026a46087e96a7209e4e3..39465ac7a2847398fb40cc4a75bae4bfde133222 100644
--- a/chrome/test/testing_pref_service.cc
+++ b/chrome/test/testing_pref_service.cc
@@ -26,13 +26,31 @@ TestingPrefService::TestingPrefValueStore::TestingPrefValueStore(
 // which they want, and expand usage of this class to more unit tests.
 TestingPrefService::TestingPrefService()
     : PrefService(new TestingPrefValueStore(
-        managed_platform_prefs_ = new DummyPrefStore(),
-        device_management_prefs_ = new DummyPrefStore(),
-        NULL,
-        NULL,
-        user_prefs_ = new DummyPrefStore(),
-        NULL,
-        default_prefs_ = new DummyPrefStore())) {
+          managed_platform_prefs_ = new DummyPrefStore(),
+          device_management_prefs_ = new DummyPrefStore(),
+          NULL,
+          NULL,
+          user_prefs_ = new DummyPrefStore(),
+          NULL,
+          default_prefs_ = new DummyPrefStore())) {
+}
+
+TestingPrefService::TestingPrefService(
+    PrefStore* managed_platform_prefs,
+    PrefStore* device_management_prefs,
+    PrefStore* extension_prefs,
+    PrefStore* command_line_prefs,
+    PrefStore* user_prefs,
+    PrefStore* recommended_prefs,
+    PrefStore* default_prefs)
+    : PrefService(new TestingPrefValueStore(
+        managed_platform_prefs_ = managed_platform_prefs,
+        device_management_prefs_ = device_management_prefs,
+        extension_prefs,
+        command_line_prefs,
+        user_prefs_ = user_prefs,
+        recommended_prefs,
+        default_prefs_ = default_prefs)) {
 }
 
 TestingPrefService::TestingPrefService(