[Sync] Add priority preferences datatype for mobile

components/sync_driver/sync_prefs.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 "components/sync_driver/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 182 matching lines @@
     if (GetDataTypePreferred(it.Get())) {
       preferred_types.Put(it.Get());
     }
   }
   return ResolvePrefGroups(registered_types, preferred_types);
 }
 
 void SyncPrefs::SetPreferredDataTypes(syncer::ModelTypeSet registered_types,
                                       syncer::ModelTypeSet preferred_types) {
   DCHECK(CalledOnValidThread());
+  preferred_types = ResolvePrefGroups(registered_types, preferred_types);
   DCHECK(registered_types.HasAll(preferred_types));
-  preferred_types = ResolvePrefGroups(registered_types, preferred_types);
   for (syncer::ModelTypeSet::Iterator i = registered_types.First(); i.Good();
        i.Inc()) {
     SetDataTypePreferred(i.Get(), preferred_types.Has(i.Get()));
   }
 }
 
 bool SyncPrefs::IsManaged() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetBoolean(prefs::kSyncManaged);
 }
@@ skipping 210 matching lines @@
   // Device info is always preferred.
   if (type == syncer::DEVICE_INFO)
     return;
 
   pref_service_->SetBoolean(pref_name, is_preferred);
 }
 
 syncer::ModelTypeSet SyncPrefs::ResolvePrefGroups(
     syncer::ModelTypeSet registered_types,
     syncer::ModelTypeSet types) const {
-  DCHECK(registered_types.HasAll(types));
   syncer::ModelTypeSet types_with_groups = types;
   for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
        i != pref_groups_.end();
        ++i) {
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
@@ skipping 29 matching lines @@
 
 bool SyncPrefs::DidSyncShutdownCleanly() const {
   return pref_service_->GetBoolean(prefs::kSyncShutdownCleanly);
 }
 
 void SyncPrefs::SetCleanShutdown(bool value) {
   pref_service_->SetBoolean(prefs::kSyncShutdownCleanly, value);
 }
 
 }  // namespace sync_driver