[Sync] Prevent uploading throttled datatypes.

chrome/browser/sync/engine/get_commit_ids_command.h

Index: chrome/browser/sync/engine/get_commit_ids_command.h
diff --git a/chrome/browser/sync/engine/get_commit_ids_command.h b/chrome/browser/sync/engine/get_commit_ids_command.h
index dcdbc519bede157a1107eb1787895656accddd98..6d7be8020d9e9956321a9002e2fe3c35ec54faa6 100644
--- a/chrome/browser/sync/engine/get_commit_ids_command.h
+++ b/chrome/browser/sync/engine/get_commit_ids_command.h
@@ -33,7 +33,8 @@ class GetCommitIdsCommand : public SyncerCommand {
   // Builds a vector of IDs that should be committed.
   void BuildCommitIds(const vector<int64>& unsynced_handles,
                       syncable::WriteTransaction* write_transaction,
-                      const ModelSafeRoutingInfo& routes);
+                      const ModelSafeRoutingInfo& routes,
+                      const syncable::ModelTypeSet& 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.
@@ -109,36 +110,44 @@ class GetCommitIdsCommand : public SyncerCommand {
 
  private:
   // Removes all entries not ready for commit from |unsynced_handles|.
-  // An entry is considered unready for commit if it's in conflict or requires
-  // (re)encryption. Any datatype requiring encryption while the cryptographer
-  // is missing a passphrase is considered unready for commit.
+  // An entry is considered unready for commit if:
+  // 1. It's in conflict or requires (re)encryption. Any datatype requiring
+  //     encryption while the cryptographer is missing a passphrase is
+  //     considered unready for commit.
+  // 2. It is currently throttled.

[akalin, 2011/11/22 23:34:17]

"It is" "Its type is"

[lipalani1, 2011/11/23 01:33:51]

Done.

   void FilterUnreadyEntries(
       syncable::BaseTransaction* trans,
-      syncable::Directory::UnsyncedMetaHandles* unsynced_handles);
+      syncable::Directory::UnsyncedMetaHandles* unsynced_handles,
+      const syncable::ModelTypeSet& throttled_types);

[akalin, 2011/11/22 23:34:17]

typically input arguments (those that don't change) go before output arguments
(those that may change).  This applies for all functions in this file.

[lipalani1, 2011/11/23 01:33:51]

Done.

 
   void AddUncommittedParentsAndTheirPredecessors(
       syncable::BaseTransaction* trans,
       syncable::Id parent_id,
-      const ModelSafeRoutingInfo& routes);
+      const ModelSafeRoutingInfo& routes,
+      const syncable::ModelTypeSet& 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, sessions::OrderedCommitSet* result);
+  bool AddItem(syncable::Entry* item, sessions::OrderedCommitSet* result,
+               const syncable::ModelTypeSet& throttled_types);
   bool AddItemThenPredecessors(syncable::BaseTransaction* trans,
                                syncable::Entry* item,
                                syncable::IndexedBitField inclusion_filter,
-                               sessions::OrderedCommitSet* result);
+                               sessions::OrderedCommitSet* result,
+                               const syncable::ModelTypeSet& throttled_types);
   void AddPredecessorsThenItem(syncable::BaseTransaction* trans,
                                syncable::Entry* item,
                                syncable::IndexedBitField inclusion_filter,
-                               const ModelSafeRoutingInfo& routes);
+                               const ModelSafeRoutingInfo& routes,
+                               const syncable::ModelTypeSet& throttled_types);
 
   bool IsCommitBatchFull();
 
   void AddCreatesAndMoves(const vector<int64>& unsynced_handles,
                           syncable::WriteTransaction* write_transaction,
-                          const ModelSafeRoutingInfo& routes);
+                          const ModelSafeRoutingInfo& routes,
+                          const syncable::ModelTypeSet& throttled_types);
 
   void AddDeletes(const vector<int64>& unsynced_handles,
                   syncable::WriteTransaction* write_transaction);