Index: chrome/browser/sync/engine/syncapi.cc |
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc |
index 938003e97199dbf9d32ed65e727920f1d021a5b6..a6939e122acaec30bafa8599bfb484083207b40a 100755 |
--- a/chrome/browser/sync/engine/syncapi.cc |
+++ b/chrome/browser/sync/engine/syncapi.cc |
@@ -1577,7 +1577,8 @@ void SyncManager::SyncInternal::HandleCalculateChangesChangeEventFromSyncApi( |
const syncable::DirectoryChangeEvent& event) { |
// We have been notified about a user action changing the bookmark model. |
DCHECK_EQ(event.todo, syncable::DirectoryChangeEvent::CALCULATE_CHANGES); |
- DCHECK_EQ(event.writer, syncable::SYNCAPI); |
+ DCHECK(event.writer == syncable::SYNCAPI || |
+ event.writer == syncable::UNITTEST); |
LOG_IF(WARNING, !ChangeBuffersAreEmpty()) << |
"CALCULATE_CHANGES called with unapplied old changes."; |
@@ -1611,7 +1612,8 @@ void SyncManager::SyncInternal::HandleCalculateChangesChangeEventFromSyncer( |
// We only expect one notification per sync step, so change_buffers_ should |
// contain no pending entries. |
DCHECK_EQ(event.todo, syncable::DirectoryChangeEvent::CALCULATE_CHANGES); |
- DCHECK_EQ(event.writer, syncable::SYNCER); |
+ DCHECK(event.writer == syncable::SYNCER || |
+ event.writer == syncable::UNITTEST); |
LOG_IF(WARNING, !ChangeBuffersAreEmpty()) << |
"CALCULATE_CHANGES called with unapplied old changes."; |