[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/syncable/syncable.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/syncable/syncable.h"
 
 #include <algorithm>
 #include <cstring>
 #include <functional>
 #include <iomanip>
@@ skipping 801 matching lines @@
 
       // Might not be in it
       num_erased = kernel_->client_tag_index->erase(entry);
       DCHECK_EQ(entry->ref(UNIQUE_CLIENT_TAG).empty(), !num_erased);
       CHECK(!kernel_->parent_id_child_index->count(entry));
       delete entry;
     }
   }
 }
 
-void Directory::PurgeEntriesWithTypeIn(ModelEnumSet types) {
+void Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
   if (types.Empty())
     return;
 
   {
     WriteTransaction trans(FROM_HERE, PURGE_ENTRIES, this);
     {
       ScopedKernelLock lock(this);
       MetahandlesIndex::iterator it = kernel_->metahandles_index->begin();
       while (it != kernel_->metahandles_index->end()) {
         const sync_pb::EntitySpecifics& local_specifics = (*it)->ref(SPECIFICS);
@@ skipping 23 matching lines @@
           num_erased = kernel_->parent_id_child_index->erase(entry);
           DCHECK_EQ(entry->ref(IS_DEL), !num_erased);
           kernel_->metahandles_index->erase(it++);
           delete entry;
         } else {
           ++it;
         }
       }
 
       // Ensure meta tracking for these data types reflects the deleted state.
-      for (syncable::ModelEnumSet::Iterator it = types.First();
+      for (syncable::ModelTypeSet::Iterator it = types.First();
            it.Good(); it.Inc()) {
         set_initial_sync_ended_for_type_unsafe(it.Get(), false);
         kernel_->persisted_info.reset_download_progress(it.Get());
       }
     }
   }
 }
 
 void Directory::HandleSaveChangesFailure(const SaveChangesSnapshot& snapshot) {
   ScopedKernelLock lock(this);
@@ skipping 141 matching lines @@
   ScopedKernelLock lock(this);
   copy(kernel_->unsynced_metahandles->begin(),
        kernel_->unsynced_metahandles->end(), back_inserter(*result));
 }
 
 int64 Directory::unsynced_entity_count() const {
   ScopedKernelLock lock(this);
   return kernel_->unsynced_metahandles->size();
 }
 
-FullModelEnumSet Directory::GetServerTypesWithUnappliedUpdates(
+FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
     BaseTransaction* trans) const {
-  syncable::FullModelEnumSet server_types;
+  syncable::FullModelTypeSet server_types;
   ScopedKernelLock lock(this);
   for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
     const ModelType type = ModelTypeFromInt(i);
     if (!kernel_->unapplied_update_metahandles[type].empty()) {
       server_types.Put(type);
     }
   }
   return server_types;
 }
 
 void Directory::GetUnappliedUpdateMetaHandles(
     BaseTransaction* trans,
-    FullModelEnumSet server_types,
+    FullModelTypeSet server_types,
     UnappliedUpdateMetaHandles* result) {
   result->clear();
   ScopedKernelLock lock(this);
   for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
     const ModelType type = ModelTypeFromInt(i);
     if (server_types.Has(type)) {
       std::copy(kernel_->unapplied_update_metahandles[type].begin(),
                 kernel_->unapplied_update_metahandles[type].end(),
                 back_inserter(*result));
     }
@@ skipping 247 matching lines @@
       // Not actually mutated, so erase from |mutations_|.
       mutations_.erase(it++);
     }
   }
   return ImmutableEntryKernelMutationMap(&mutations_);
 }
 
 void WriteTransaction::UnlockAndNotify(
     const ImmutableEntryKernelMutationMap& mutations) {
   // Work while transaction mutex is held.
-  ModelEnumSet models_with_changes;
+  ModelTypeSet models_with_changes;
   bool has_mutations = !mutations.Get().empty();
   if (has_mutations) {
     models_with_changes = NotifyTransactionChangingAndEnding(mutations);
   }
   Unlock();
 
   // Work after mutex is relased.
   if (has_mutations) {
     NotifyTransactionComplete(models_with_changes);
   }
 }
 
-ModelEnumSet WriteTransaction::NotifyTransactionChangingAndEnding(
+ModelTypeSet WriteTransaction::NotifyTransactionChangingAndEnding(
     const ImmutableEntryKernelMutationMap& mutations) {
   dirkernel_->transaction_mutex.AssertAcquired();
   DCHECK(!mutations.Get().empty());
 
   WriteTransactionInfo write_transaction_info(
       dirkernel_->next_write_transaction_id, from_here_, writer_, mutations);
   ++dirkernel_->next_write_transaction_id;
 
   ImmutableWriteTransactionInfo immutable_write_transaction_info(
       &write_transaction_info);
   DirectoryChangeDelegate* const delegate = dirkernel_->delegate;
   if (writer_ == syncable::SYNCAPI) {
     delegate->HandleCalculateChangesChangeEventFromSyncApi(
         immutable_write_transaction_info, this);
   } else {
     delegate->HandleCalculateChangesChangeEventFromSyncer(
         immutable_write_transaction_info, this);
   }
 
-  ModelEnumSet models_with_changes =
+  ModelTypeSet models_with_changes =
       delegate->HandleTransactionEndingChangeEvent(
           immutable_write_transaction_info, this);
 
   dirkernel_->transaction_observer.Call(FROM_HERE,
       &TransactionObserver::OnTransactionWrite,
       immutable_write_transaction_info, models_with_changes);
 
   return models_with_changes;
 }
 
 void WriteTransaction::NotifyTransactionComplete(
-    ModelEnumSet models_with_changes) {
+    ModelTypeSet models_with_changes) {
   dirkernel_->delegate->HandleTransactionCompleteChangeEvent(
       models_with_changes);
 }
 
 WriteTransaction::~WriteTransaction() {
   const ImmutableEntryKernelMutationMap& mutations = RecordMutations();
 
   if (OFF != kInvariantCheckLevel) {
     const bool full_scan = (FULL_DB_VERIFICATION == kInvariantCheckLevel);
     if (full_scan)
@@ skipping 745 matching lines @@
     if (entry->ref(NEXT_ID).IsRoot() ||
         entry->ref(NEXT_ID) != entry->ref(PREV_ID)) {
       return entry;
     }
   }
   // There were no children in the linked list.
   return NULL;
 }
 
 }  // namespace syncable