| Index: sync/syncable/directory.cc
|
| diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
|
| index 5dac15a2ee3d5c0eba14522c5242a9fb78252b66..37afc912d76f25e8d38a19d2d02abaf3d2f70adf 100644
|
| --- a/sync/syncable/directory.cc
|
| +++ b/sync/syncable/directory.cc
|
| @@ -623,7 +623,7 @@ void Directory::PurgeEntriesWithTypeIn(ModelTypeSet types) {
|
| }
|
|
|
| // Ensure meta tracking for these data types reflects the deleted state.
|
| - for (syncable::ModelTypeSet::Iterator it = types.First();
|
| + for (syncer::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());
|
| @@ -798,7 +798,7 @@ int64 Directory::unsynced_entity_count() const {
|
|
|
| FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
|
| BaseTransaction* trans) const {
|
| - syncable::FullModelTypeSet server_types;
|
| + syncer::FullModelTypeSet server_types;
|
| ScopedKernelLock lock(this);
|
| for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
|
| const ModelType type = ModelTypeFromInt(i);
|
|
|