Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3316)

Unified Diff: chrome/browser/sync/engine/store_timestamps_command.cc

Issue 8851004: [Sync] Replace all instances of ModelTypeBitSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command.cc ('k') | chrome/browser/sync/engine/sync_scheduler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/store_timestamps_command.cc
diff --git a/chrome/browser/sync/engine/store_timestamps_command.cc b/chrome/browser/sync/engine/store_timestamps_command.cc
index 1fe0ebf6d30cdfe934e3ed4582c4eab97af3649c..345f0391517bb278d36f4a6e31c174cf5f4160bc 100644
--- a/chrome/browser/sync/engine/store_timestamps_command.cc
+++ b/chrome/browser/sync/engine/store_timestamps_command.cc
@@ -32,7 +32,7 @@ void StoreTimestampsCommand::ExecuteImpl(sessions::SyncSession* session) {
// Update the progress marker tokens from the server result. If a marker
// was omitted for any one type, that indicates no change from the previous
// state.
- syncable::ModelTypeBitSet forward_progress_types;
+ syncable::ModelEnumSet forward_progress_types;
for (int i = 0; i < updates.new_progress_marker_size(); ++i) {
syncable::ModelType model =
syncable::GetModelTypeFromExtensionFieldNumber(
@@ -41,15 +41,16 @@ void StoreTimestampsCommand::ExecuteImpl(sessions::SyncSession* session) {
NOTREACHED() << "Unintelligible server response.";
continue;
}
- forward_progress_types[model] = true;
+ forward_progress_types.Put(model);
dir->SetDownloadProgress(model, updates.new_progress_marker(i));
}
- DCHECK(forward_progress_types.any() ||
+ DCHECK(!forward_progress_types.Empty() ||
updates.changes_remaining() == 0);
if (VLOG_IS_ON(1)) {
- DVLOG_IF(1, forward_progress_types.any())
+ DVLOG_IF(1, !forward_progress_types.Empty())
<< "Get Updates got new progress marker for types: "
- << forward_progress_types.to_string() << " out of possible: "
+ << syncable::ModelEnumSetToString(forward_progress_types)
+ << " out of possible: "
<< syncable::ModelEnumSetToString(status->updates_request_types());
}
if (updates.has_changes_remaining()) {
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command.cc ('k') | chrome/browser/sync/engine/sync_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698