Convert PrefSyncStatus into PrefRegistrationFlags

base/prefs/pref_service.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 "base/prefs/pref_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 298 matching lines @@
   DCHECK(CalledOnValidThread());
   // Lookup the preference in the default store.
   const base::Value* value = NULL;
   if (!pref_registry_->defaults()->GetValue(path, &value)) {
     NOTREACHED() << "Default value missing for pref: " << path;
     return NULL;
   }
   return value;
 }
 
+uint32 PrefService::GetRegistrationFlags(const std::string& path) const {
+  DCHECK(CalledOnValidThread());
+  const auto& it = pref_registry_->registration_flags().find(path);
+  if (it == pref_registry_->registration_flags().end()) {

[Mattias Nissler (ping if slow), 2015/04/20 09:33:34]

I'd prefer having this logic in PrefRegistry, and the latter exposing a
GetRegistrationFlags(const std::string& path) function which you can call here.
Doing so would keep flag handling/defaulting in one place.

[raymes, 2015/04/21 07:58:54]

Sounds good but the function isn't used at all for now so I'll just remove it.

+    NOTREACHED() << "Registration flags missing for pref: " << path;
+    return PrefRegistry::NO_REGISTRATION_FLAGS;
+  }
+  return it->second;
+}
+
 const base::ListValue* PrefService::GetList(const std::string& path) const {
   DCHECK(CalledOnValidThread());
 
   const base::Value* value = GetPreferenceValue(path);
   if (!value) {
     NOTREACHED() << "Trying to read an unregistered pref: " << path;
     return NULL;
   }
   if (value->GetType() != base::Value::TYPE_LIST) {
     NOTREACHED();
@@ skipping 255 matching lines @@
       DCHECK(found_value->IsType(default_type));
       return found_value;
     } else {
       // Every registered preference has at least a default value.
       NOTREACHED() << "no valid value found for registered pref " << path;
     }
   }
 
   return NULL;
 }