Sanitize PrefStore interface.

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 9cc532121d43f845950179f62a55ffe15efc84a6..1e0b78eb111cce98faf63009689e29157e0fe210 100644
--- a/chrome/test/testing_pref_service.cc
+++ b/chrome/test/testing_pref_service.cc
@@ -23,36 +23,6 @@ TestingPrefService::TestingPrefService()
         NULL) {
 }
 
-TestingPrefService::TestingPrefService(
-    policy::ConfigurationPolicyProvider* managed_platform_provider,
-    policy::ConfigurationPolicyProvider* device_management_provider,
-    CommandLine* command_line)
-    : PrefService(
-        managed_platform_prefs_ = CreatePolicyPrefStoreFromProvider(
-            managed_platform_provider),
-        device_management_prefs_ =
-            CreatePolicyPrefStoreFromProvider(device_management_provider),
-        NULL,
-        CreateCommandLinePrefStore(command_line),
-        user_prefs_ = new TestingPrefStore(),
-        NULL,
-        NULL) {
-}
-
-PrefStore* TestingPrefService::CreatePolicyPrefStoreFromProvider(
-    policy::ConfigurationPolicyProvider* provider) {
-  if (provider)
-    return new policy::ConfigurationPolicyPrefStore(provider);
-  return new TestingPrefStore();
-}
-
-PrefStore* TestingPrefService::CreateCommandLinePrefStore(
-    CommandLine* command_line) {
-  if (command_line)
-    return new CommandLinePrefStore(command_line);
-  return new TestingPrefStore();
-}
-
 const Value* TestingPrefService::GetManagedPref(const char* path) {
   return GetPref(managed_platform_prefs_, path);
 }
@@ -65,16 +35,6 @@ void TestingPrefService::RemoveManagedPref(const char* path) {
   RemovePref(managed_platform_prefs_, path);
 }
 
-void TestingPrefService::SetManagedPrefWithoutNotification(const char* path,
-                                                           Value* value) {
-  managed_platform_prefs_->prefs()->Set(path, value);
-}
-
-void TestingPrefService::RemoveManagedPrefWithoutNotification(
-    const char* path) {
-  managed_platform_prefs_->prefs()->Remove(path, NULL);
-}
-
 const Value* TestingPrefService::GetUserPref(const char* path) {
   return GetPref(user_prefs_, path);
 }
@@ -87,21 +47,19 @@ void TestingPrefService::RemoveUserPref(const char* path) {
   RemovePref(user_prefs_, path);
 }
 
-const Value* TestingPrefService::GetPref(PrefStore* pref_store,
+const Value* TestingPrefService::GetPref(TestingPrefStore* pref_store,
                                          const char* path) {
-  Value* result;
-  return pref_store->prefs()->Get(path, &result) ? result : NULL;
+  Value* res;
+  return pref_store->GetValue(path, &res) == PrefStore::READ_OK ? res : NULL;
 }
 
-void TestingPrefService::SetPref(PrefStore* pref_store,
+void TestingPrefService::SetPref(TestingPrefStore* pref_store,
                                  const char* path,
                                  Value* value) {
-  pref_store->prefs()->Set(path, value);
-  pref_notifier()->OnPreferenceChanged(path);
+  pref_store->SetValue(path, value);
 }
 
-void TestingPrefService::RemovePref(PrefStore* pref_store,
+void TestingPrefService::RemovePref(TestingPrefStore* pref_store,
                                     const char* path) {
-  pref_store->prefs()->Remove(path, NULL);
-  pref_notifier()->OnPreferenceChanged(path);
+  pref_store->RemoveValue(path);
 }