Index: chrome/browser/sync/test_profile_sync_service.cc |
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc |
index 3f06f605d3ce67728927fff67b7b0c8e93bfe513..3155f4460bf8f9ae1d244e4b0e3fab75d06e16e0 100644 |
--- a/chrome/browser/sync/test_profile_sync_service.cc |
+++ b/chrome/browser/sync/test_profile_sync_service.cc |
@@ -62,9 +62,9 @@ SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {} |
void SyncBackendHostForProfileSyncTest:: |
SimulateSyncCycleCompletedInitialSyncEnded( |
const tracked_objects::Location& location) { |
- syncable::ModelTypeBitSet sync_ended; |
+ syncable::ModelEnumSet sync_ended; |
if (!fail_initial_download_) |
- sync_ended.set(); |
+ sync_ended = syncable::ModelEnumSet::All(); |
std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; |
core_->HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot( |
SyncerStatus(), ErrorCounters(), 0, false, |
@@ -98,10 +98,10 @@ void SyncBackendHostForProfileSyncTest::StartConfiguration( |
const base::Closure& callback) { |
SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop(); |
if (initialization_state_ == DOWNLOADING_NIGORI) { |
- syncable::ModelTypeBitSet sync_ended; |
+ syncable::ModelEnumSet sync_ended; |
if (!fail_initial_download_) |
- sync_ended.set(syncable::NIGORI); |
+ sync_ended.Put(syncable::NIGORI); |
std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; |
core_->HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot( |
SyncerStatus(), ErrorCounters(), 0, false, |