Introduce incognito preference settings.

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 66342bc471b83327431e8980b7614c972c1d15d2..f322e811056ff9d83ae73d2318754323d4afeb05 100644
--- a/chrome/test/testing_pref_service.cc
+++ b/chrome/test/testing_pref_service.cc
@@ -4,23 +4,48 @@
 
 #include "chrome/test/testing_pref_service.h"
 
+#include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
+#include "chrome/browser/prefs/default_pref_store.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 
 // TODO(pamg): Instantiate no PrefStores by default. Allow callers to specify
 // which they want, and expand usage of this class to more unit tests.
+
+TestingPrefServiceBase::TestingPrefServiceBase(
+    TestingPrefStore* managed_platform_prefs,
+    TestingPrefStore* device_management_prefs,
+    ExtensionPrefStore* extension_prefs,
+    TestingPrefStore* user_prefs)
+    : PrefService(managed_platform_prefs,
+                  device_management_prefs,
+                  extension_prefs,
+                  NULL,
+                  user_prefs,
+                  NULL,
+                  new DefaultPrefStore(),
+                  NULL,
+                  true),
+      managed_platform_prefs_(managed_platform_prefs),
+      device_management_prefs_(device_management_prefs),
+      extension_prefs_(extension_prefs),
+      user_prefs_(user_prefs) {
+}
+
+TestingPrefServiceBase::~TestingPrefServiceBase() {
+}
+
 TestingPrefService::TestingPrefService()
-    : PrefService(
-        managed_platform_prefs_ = new TestingPrefStore(),
-        device_management_prefs_ = new TestingPrefStore(),
-        NULL,
-        NULL,
-        user_prefs_ = new TestingPrefStore(),
-        NULL,
-        NULL) {
+    : TestingPrefServiceBase(new TestingPrefStore(),
+                             new TestingPrefStore(),
+                             new ExtensionPrefStore(),
+                             new TestingPrefStore()) {
+}
+
+TestingPrefService::~TestingPrefService() {
 }
 
 const Value* TestingPrefService::GetManagedPref(const char* path) const {
@@ -63,3 +88,7 @@ void TestingPrefService::RemovePref(TestingPrefStore* pref_store,
                                     const char* path) {
   pref_store->RemoveValue(path);
 }
+
+ExtensionPrefStore* TestingPrefService::GetExtensionPrefs() {
+  return extension_prefs_.get();
+}