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..f5affebfef1353dd7c213dbf5184e9f4ad6869b3 100644
--- a/chrome/test/testing_pref_service.cc
+++ b/chrome/test/testing_pref_service.cc
@@ -36,6 +36,24 @@ TestingPrefService::TestingPrefService()
 }
 
 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,

[Mattias Nissler (ping if slow), 2010/12/01 10:36:36]

I'd expect two spaces more indentation here, because the statement starts at
PrefService. Not totally sure though.

[battre (please use the other), 2010/12/01 17:44:38]

I agree. Done.

+        device_management_prefs_ = device_management_prefs,
+        extension_prefs,
+        command_line_prefs,
+        user_prefs_ = user_prefs,
+        recommended_prefs,
+        default_prefs_ = default_prefs)) {
+}
+
+TestingPrefService::TestingPrefService(
     policy::ConfigurationPolicyProvider* managed_platform_provider,
     policy::ConfigurationPolicyProvider* device_management_provider,
     CommandLine* command_line)