Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/prefs/pref_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/mock_pref_change_callback.h"
 #include "chrome/browser/prefs/pref_registry_simple.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 282 matching lines @@
 // preserves its empty value.
 TEST_F(PrefServiceUserFilePrefsTest, PreserveEmptyValue) {
   base::FilePath pref_file = temp_dir_.path().AppendASCII("write.json");
 
   ASSERT_TRUE(file_util::CopyFile(
       data_dir_.AppendASCII("read.need_empty_value.json"),
       pref_file));
 
   PrefServiceMockBuilder builder;
   builder.WithUserFilePrefs(pref_file, message_loop_.message_loop_proxy());
-  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable());
+  scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);
+  scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
 
   // Register testing prefs.
-  prefs->RegisterListPref("list",
-                          PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterDictionaryPref("dict",
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterListPref("list",
+                             PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref("dict",
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   base::ListValue* non_empty_list = new base::ListValue;
   non_empty_list->Append(base::Value::CreateStringValue("test"));
-  prefs->RegisterListPref("list_needs_empty_value",
-                          non_empty_list,
-                          PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterListPref("list_needs_empty_value",
+                             non_empty_list,
+                             PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   base::DictionaryValue* non_empty_dict = new base::DictionaryValue;
   non_empty_dict->SetString("dummy", "whatever");
-  prefs->RegisterDictionaryPref("dict_needs_empty_value",
-                                non_empty_dict,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref("dict_needs_empty_value",
+                                   non_empty_dict,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // Set all testing prefs to empty.
   ClearListValue(prefs.get(), "list");
   ClearListValue(prefs.get(), "list_needs_empty_value");
   ClearDictionaryValue(prefs.get(), "dict");
   ClearDictionaryValue(prefs.get(), "dict_needs_empty_value");
 
   // Write to file.
   prefs->CommitPendingWrite();
   message_loop_.RunUntilIdle();
@@ skipping 146 matching lines @@
   const char kDefaultFont[] = "Times";
 #elif defined(OS_CHROMEOS)
   const char kDefaultFont[] = "Tinos";
 #else
   const char kDefaultFont[] = "Times New Roman";
 #endif
   EXPECT_EQ(ASCIIToUTF16(kDefaultFont),
             webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
   EXPECT_TRUE(webkit_prefs.javascript_enabled);
 }