sync: Implementation of Priority Preferences.

chrome/browser/prefs/pref_model_associator.cc

Index: chrome/browser/prefs/pref_model_associator.cc
diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
index 09e98d50d72db01bd53dc7fcec06863c716b2112..2516172151d0d2d05e769f8aa8dc81a9304c4233 100644
--- a/chrome/browser/prefs/pref_model_associator.cc
+++ b/chrome/browser/prefs/pref_model_associator.cc
@@ -21,12 +21,39 @@
 #include "sync/protocol/sync.pb.h"
 
 using syncer::PREFERENCES;
+using syncer::PRIORITY_PREFERENCES;
 
-PrefModelAssociator::PrefModelAssociator()
+namespace {
+
+const sync_pb::PreferenceSpecifics& GetSpecifics(const syncer::SyncData& pref) {
+  if (pref.GetDataType() == syncer::PREFERENCES) {
+    return pref.GetSpecifics().preference();
+  } else {
+    return pref.GetSpecifics().priority_preference().preference();

[Mattias Nissler (ping if slow), 2013/03/21 06:50:15]

nit: Is assuming priority preference as the default if the data type being
passed is bogus the right thing? (I'm aware this cannot happen (TM))

[albertb, 2013/03/21 17:10:33]

I made normal preferences the default and added a DCHECK. Or were you suggesting
something else?

+  }
+}
+
+sync_pb::PreferenceSpecifics* GetMutableSpecifics(
+    const syncer::ModelType type,
+    sync_pb::EntitySpecifics* specifics) {
+  if (type == syncer::PREFERENCES) {
+    DCHECK(!specifics->has_priority_preference());
+    return specifics->mutable_preference();
+  } else {
+    DCHECK(!specifics->has_preference());
+    return specifics->mutable_priority_preference()->mutable_preference();

[Mattias Nissler (ping if slow), 2013/03/21 06:50:15]

ditto

+  }
+}
+
+}  // namespace
+
+PrefModelAssociator::PrefModelAssociator(syncer::ModelType type)
     : models_associated_(false),
       processing_syncer_changes_(false),
-      pref_service_(NULL) {
+      pref_service_(NULL),
+      type_(type) {
   DCHECK(CalledOnValidThread());
+  DCHECK(type_ == PREFERENCES || type_ == PRIORITY_PREFERENCES);
 }
 
 PrefModelAssociator::~PrefModelAssociator() {
@@ -43,8 +70,7 @@ void PrefModelAssociator::InitPrefAndAssociate(
   VLOG(1) << "Associating preference " << pref_name;
 
   if (sync_pref.IsValid()) {
-    const sync_pb::PreferenceSpecifics& preference =
-        sync_pref.GetSpecifics().preference();
+    const sync_pb::PreferenceSpecifics& preference = GetSpecifics(sync_pref);
     DCHECK_EQ(pref_name, preference.name());
 
     base::JSONReader reader;
@@ -124,7 +150,7 @@ syncer::SyncMergeResult PrefModelAssociator::MergeDataAndStartSyncing(
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
     scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
-  DCHECK_EQ(type, PREFERENCES);
+  DCHECK_EQ(type_, type);
   DCHECK(CalledOnValidThread());
   DCHECK(pref_service_);
   DCHECK(!sync_processor_.get());
@@ -143,8 +169,11 @@ syncer::SyncMergeResult PrefModelAssociator::MergeDataAndStartSyncing(
            initial_sync_data.begin();
        sync_iter != initial_sync_data.end();
        ++sync_iter) {
-    DCHECK_EQ(PREFERENCES, sync_iter->GetDataType());
-    std::string sync_pref_name = sync_iter->GetSpecifics().preference().name();
+    DCHECK_EQ(type_, sync_iter->GetDataType());
+
+    const sync_pb::PreferenceSpecifics& preference = GetSpecifics(*sync_iter);
+    const std::string& sync_pref_name = preference.name();
+
     if (remaining_preferences.count(sync_pref_name) == 0) {
       // We're not syncing this preference locally, ignore the sync data.
       // TODO(zea): Eventually we want to be able to have the syncable service
@@ -178,7 +207,7 @@ syncer::SyncMergeResult PrefModelAssociator::MergeDataAndStartSyncing(
 }
 
 void PrefModelAssociator::StopSyncing(syncer::ModelType type) {
-  DCHECK_EQ(type, PREFERENCES);
+  DCHECK_EQ(type_, type);
   models_associated_ = false;
   sync_processor_.reset();
   sync_error_factory_.reset();
@@ -205,7 +234,7 @@ scoped_ptr<Value> PrefModelAssociator::MergePreference(
 bool PrefModelAssociator::CreatePrefSyncData(
     const std::string& name,
     const Value& value,
-    syncer::SyncData* sync_data) {
+    syncer::SyncData* sync_data) const {
   if (value.IsType(Value::TYPE_NULL)) {
     LOG(ERROR) << "Attempting to sync a null pref value for " << name;
     return false;
@@ -221,7 +250,9 @@ bool PrefModelAssociator::CreatePrefSyncData(
   }
 
   sync_pb::EntitySpecifics specifics;
-  sync_pb::PreferenceSpecifics* pref_specifics = specifics.mutable_preference();
+  sync_pb::PreferenceSpecifics* pref_specifics =
+      GetMutableSpecifics(type_, &specifics);
+
   pref_specifics->set_name(name);
   pref_specifics->set_value(serialized);
   *sync_data = syncer::SyncData::CreateLocalData(name, name, specifics);
@@ -290,7 +321,7 @@ Value* PrefModelAssociator::MergeDictionaryValues(
 syncer::SyncDataList PrefModelAssociator::GetAllSyncData(
     syncer::ModelType type)
     const {
-  DCHECK_EQ(PREFERENCES, type);
+  DCHECK_EQ(type_, type);
   syncer::SyncDataList current_data;
   for (PreferenceSet::const_iterator iter = synced_preferences_.begin();
        iter != synced_preferences_.end();
@@ -322,11 +353,12 @@ syncer::SyncError PrefModelAssociator::ProcessSyncChanges(
   base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true);
   syncer::SyncChangeList::const_iterator iter;
   for (iter = change_list.begin(); iter != change_list.end(); ++iter) {
-    DCHECK_EQ(PREFERENCES, iter->sync_data().GetDataType());
+    DCHECK_EQ(type_, iter->sync_data().GetDataType());
 
     std::string name;
-    sync_pb::PreferenceSpecifics pref_specifics =
-        iter->sync_data().GetSpecifics().preference();
+    const sync_pb::PreferenceSpecifics& pref_specifics =
+        GetSpecifics(iter->sync_data());
+
     scoped_ptr<Value> value(ReadPreferenceSpecifics(pref_specifics,
                                                     &name));