[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

Also change some functions to return ModelEnumSets directly instead of
taking a pointer value.

BUG=79970
TEST=


Review URL: http://codereview.chromium.org/8851006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113906 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/sync/engine/get_commit_ids_command.h b/chrome/browser/sync/engine/get_commit_ids_command.h
index 6422e73..5cd923a 100644
--- a/chrome/browser/sync/engine/get_commit_ids_command.h
+++ b/chrome/browser/sync/engine/get_commit_ids_command.h
@@ -34,7 +34,7 @@ class GetCommitIdsCommand : public SyncerCommand {
   void BuildCommitIds(const vector<int64>& unsynced_handles,
                       syncable::WriteTransaction* write_transaction,
                       const ModelSafeRoutingInfo& routes,
-                      const syncable::ModelTypeSet& throttled_types);
+                      syncable::ModelEnumSet throttled_types);
 
   // TODO(chron): Remove writes from this iterator. As a warning, this
   // iterator causes writes to entries and so isn't a pure iterator.
@@ -117,28 +117,28 @@ class GetCommitIdsCommand : public SyncerCommand {
   // 2. Its type is currently throttled.
   void FilterUnreadyEntries(
       syncable::BaseTransaction* trans,
-      const syncable::ModelTypeSet& throttled_types,
+      syncable::ModelEnumSet throttled_types,
       syncable::Directory::UnsyncedMetaHandles* unsynced_handles);
 
   void AddUncommittedParentsAndTheirPredecessors(
       syncable::BaseTransaction* trans,
       syncable::Id parent_id,
       const ModelSafeRoutingInfo& routes,
-      const syncable::ModelTypeSet& throttled_types);
+      syncable::ModelEnumSet throttled_types);
 
   // OrderedCommitSet helpers for adding predecessors in order.
   // TODO(ncarter): Refactor these so that the |result| parameter goes away,
   // and AddItem doesn't need to consider two OrderedCommitSets.
   bool AddItem(syncable::Entry* item,
-               const syncable::ModelTypeSet& throttled_types,
+               syncable::ModelEnumSet throttled_types,
                sessions::OrderedCommitSet* result);
   bool AddItemThenPredecessors(syncable::BaseTransaction* trans,
-                               const syncable::ModelTypeSet& throttled_types,
+                               syncable::ModelEnumSet throttled_types,
                                syncable::Entry* item,
                                syncable::IndexedBitField inclusion_filter,
                                sessions::OrderedCommitSet* result);
   void AddPredecessorsThenItem(syncable::BaseTransaction* trans,
-                               const syncable::ModelTypeSet& throttled_types,
+                               syncable::ModelEnumSet throttled_types,
                                syncable::Entry* item,
                                syncable::IndexedBitField inclusion_filter,
                                const ModelSafeRoutingInfo& routes);
@@ -148,7 +148,7 @@ class GetCommitIdsCommand : public SyncerCommand {
   void AddCreatesAndMoves(const vector<int64>& unsynced_handles,
                           syncable::WriteTransaction* write_transaction,
                           const ModelSafeRoutingInfo& routes,
-                          const syncable::ModelTypeSet& throttled_types);
+                          syncable::ModelEnumSet throttled_types);
 
   void AddDeletes(const vector<int64>& unsynced_handles,
                   syncable::WriteTransaction* write_transaction);
@@ -157,7 +157,7 @@ class GetCommitIdsCommand : public SyncerCommand {
 
   int requested_commit_batch_size_;
   bool passphrase_missing_;
-  syncable::ModelTypeSet encrypted_types_;
+  syncable::ModelEnumSet encrypted_types_;
 
   DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand);
 };