Convert PrefSyncStatus into PrefRegistrationFlags

base/prefs/pref_registry.h

 // 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 BASE_PREFS_PREF_REGISTRY_H_
 #define BASE_PREFS_PREF_REGISTRY_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/base_prefs_export.h"
 #include "base/prefs/pref_value_map.h"
 
 namespace base {
 class Value;
 }
 
 class DefaultPrefStore;
 class PrefStore;
 
 // Preferences need to be registered with a type and default value
 // before they are used.
 //
 // The way you use a PrefRegistry is that you register all required
 // preferences on it (via one of its subclasses), then pass it as a
 // construction parameter to PrefService.
 //
 // Currently, registrations after constructing the PrefService will
 // also work, but this is being deprecated.
 class BASE_PREFS_EXPORT PrefRegistry : public base::RefCounted<PrefRegistry> {
  public:
+  // Registration flags that can be specified which impact how the pref will
+  // behave or be stored. This will be passed in a bitmask when the pref is
+  // registered. Subclasses of PrefRegistry can specify their own flags. Care
+  // must be taken to ensure none of these overlap with the flags below.
+  enum PrefRegistrationFlags {
+    // No flags are specified.
+    NO_REGISTRATION_FLAGS = 0,
+
+    // The first 8 bits are reserved for subclasses of PrefRegistry to use.
+  };
+
   typedef PrefValueMap::const_iterator const_iterator;
+  typedef std::map<std::string, uint32> PrefRegistrationFlagsMap;
 
   PrefRegistry();
 
+  // Retrieve the set of registration flags for preferences currently
+  // registered.
+  const PrefRegistrationFlagsMap& registration_flags() const {

[Mattias Nissler (ping if slow), 2015/04/22 07:06:34]

OK, so you made the change to not store entries if flags == 0. Please also
replace this function with a GetRegistrationFlags(const std::string& pref)
function that returns the correct flags value regardless of whether the pref has
an entry in |registration_flags_|.

[raymes, 2015/04/23 05:21:03]

Done.

+    return registration_flags_;
+  }
+
   // Gets the registered defaults.
   scoped_refptr<PrefStore> defaults();
 
   // Allows iteration over defaults.
   const_iterator begin() const;
   const_iterator end() const;
 
   // Changes the default value for a preference. Takes ownership of |value|.
   //
   // |pref_name| must be a previously registered preference.
   void SetDefaultPrefValue(const std::string& pref_name, base::Value* value);
 
  protected:
   friend class base::RefCounted<PrefRegistry>;
   virtual ~PrefRegistry();
 
-  // Used by subclasses to register a default value for a preference.
-  void RegisterPreference(const std::string& path, base::Value* default_value);
+  // Used by subclasses to register a default value and registration flags for
+  // a preference. |flags| is a bitmask of |PrefRegistrationFlags|.
+  void RegisterPreference(const std::string& path,
+                          base::Value* default_value,
+                          uint32 flags);
 
   scoped_refptr<DefaultPrefStore> defaults_;
 
+  // A map of pref name to a bitmask of PrefRegistrationFlags.
+  PrefRegistrationFlagsMap registration_flags_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(PrefRegistry);
 };
 
 #endif  // BASE_PREFS_PREF_REGISTRY_H_