Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/prefs/pref_registry_syncable.h

Index: chrome/browser/prefs/pref_registry_syncable.h
diff --git a/chrome/browser/prefs/pref_registry_syncable.h b/chrome/browser/prefs/pref_registry_syncable.h
new file mode 100644
index 0000000000000000000000000000000000000000..35f9e64facd078a94ed5b3cc24d493f4a2f3e48d
--- /dev/null
+++ b/chrome/browser/prefs/pref_registry_syncable.h
@@ -0,0 +1,98 @@
+// 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.
+
+#ifndef CHROME_BROWSER_PREFS_PREF_REGISTRY_SYNCABLE_H_
+#define CHROME_BROWSER_PREFS_PREF_REGISTRY_SYNCABLE_H_
+
+#include <string>
+
+#include "chrome/browser/prefs/pref_registry.h"
+
+namespace base {
+class DictionaryValue;
+class ListValue;
+class Value;
+}
+
+class FilePath;
+
+// A PrefRegistry that forces users to choose whether each registered
+// preference is syncable or not.
+class PrefRegistrySyncable : public PrefRegistry {
+ public:
+  typedef base::Callback<void(const char* path)> SyncableRegistrationCallback;

[Mattias Nissler (ping if slow), 2013/01/31 15:30:19]

Callback needs #include or forward-declaration

+
+  // Enum used when registering preferences to determine if it should
+  // be synced or not.
+  enum PrefSyncStatus {
+    UNSYNCABLE_PREF,
+    SYNCABLE_PREF
+  };
+
+  PrefRegistrySyncable();
+
+  // Exactly one callback can be set for the event of a syncable
+  // preference being registered. It will be fired after the
+  // registration has occurred.
+  //
+  // Calling this method after a callback has already been set will
+  // make the object forget the previous callback and use the new one
+  // instead.
+  void SetSyncableRegistrationCallback(const SyncableRegistrationCallback& cb);
+
+  void RegisterBooleanPref(const char* path,
+                           bool default_value,
+                           PrefSyncStatus sync_status);
+  void RegisterIntegerPref(const char* path,
+                           int default_value,
+                           PrefSyncStatus sync_status);
+  void RegisterDoublePref(const char* path,
+                          double default_value,
+                          PrefSyncStatus sync_status);
+  void RegisterStringPref(const char* path,
+                          const std::string& default_value,
+                          PrefSyncStatus sync_status);
+  void RegisterFilePathPref(const char* path,
+                            const FilePath& default_value,
+                            PrefSyncStatus sync_status);
+  void RegisterListPref(const char* path,
+                        PrefSyncStatus sync_status);
+  void RegisterDictionaryPref(const char* path,
+                              PrefSyncStatus sync_status);
+  void RegisterListPref(const char* path,
+                        base::ListValue* default_value,
+                        PrefSyncStatus sync_status);
+  void RegisterDictionaryPref(const char* path,
+                              base::DictionaryValue* default_value,
+                              PrefSyncStatus sync_status);
+  void RegisterLocalizedBooleanPref(const char* path,
+                                    int locale_default_message_id,
+                                    PrefSyncStatus sync_status);
+  void RegisterLocalizedIntegerPref(const char* path,
+                                    int locale_default_message_id,
+                                    PrefSyncStatus sync_status);
+  void RegisterLocalizedDoublePref(const char* path,
+                                   int locale_default_message_id,
+                                   PrefSyncStatus sync_status);
+  void RegisterLocalizedStringPref(const char* path,
+                                   int locale_default_message_id,
+                                   PrefSyncStatus sync_status);
+  void RegisterInt64Pref(const char* path,
+                         int64 default_value,
+                         PrefSyncStatus sync_status);
+  void RegisterUint64Pref(const char* path,
+                          uint64 default_value,
+                          PrefSyncStatus sync_status);
+
+ private:
+  virtual ~PrefRegistrySyncable();
+
+  void RegisterSyncablePreference(const char* path,
+                                  base::Value* default_value,
+                                  PrefSyncStatus sync_status);
+
+  SyncableRegistrationCallback callback_;

[Mattias Nissler (ping if slow), 2013/01/31 15:30:19]

DISALLOW_COPY_AND_ASSIGN

+};
+
+#endif  // CHROME_BROWSER_PREFS_PREF_REGISTRY_SYNCABLE_H_