Index: chrome/browser/sync/glue/shared_change_processor.cc |
diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc |
index abe7070867a8eb6ff0b41d037498adccda088034..8b4e26adbeb26e7f4d1e8522467eddb791ff76e6 100644 |
--- a/chrome/browser/sync/glue/shared_change_processor.cc |
+++ b/chrome/browser/sync/glue/shared_change_processor.cc |
@@ -89,22 +89,6 @@ bool SharedChangeProcessor::Disconnect() { |
return was_connected; |
} |
-syncer::SyncError SharedChangeProcessor::GetSyncData( |
- syncer::SyncDataList* current_sync_data) { |
- DCHECK(backend_loop_.get()); |
- DCHECK(backend_loop_->BelongsToCurrentThread()); |
- AutoLock lock(monitor_lock_); |
- if (disconnected_) { |
- syncer::SyncError error(FROM_HERE, |
- syncer::SyncError::DATATYPE_ERROR, |
- "Change processor disconnected.", |
- type_); |
- return error; |
- } |
- return generic_change_processor_->GetSyncDataForType(type_, |
- current_sync_data); |
-} |
- |
int SharedChangeProcessor::GetSyncCount() { |
DCHECK(backend_loop_.get()); |
DCHECK(backend_loop_->BelongsToCurrentThread()); |
@@ -135,6 +119,29 @@ syncer::SyncError SharedChangeProcessor::ProcessSyncChanges( |
from_here, list_of_changes); |
} |
+syncer::SyncDataList SharedChangeProcessor::GetAllSyncData( |
+ syncer::ModelType type) const { |
+ syncer::SyncDataList data; |
+ GetAllSyncDataReturnError(type, &data); // Handles the disconnect case. |
+ return data; |
+} |
+ |
+syncer::SyncError SharedChangeProcessor::GetAllSyncDataReturnError( |
+ syncer::ModelType type, |
+ syncer::SyncDataList* data) const { |
+ DCHECK(backend_loop_.get()); |
+ DCHECK(backend_loop_->BelongsToCurrentThread()); |
+ AutoLock lock(monitor_lock_); |
+ if (disconnected_) { |
+ syncer::SyncError error(FROM_HERE, |
+ syncer::SyncError::DATATYPE_ERROR, |
+ "Change processor disconnected.", |
+ type_); |
+ return error; |
+ } |
+ return generic_change_processor_->GetAllSyncDataReturnError(type, data); |
+} |
+ |
bool SharedChangeProcessor::SyncModelHasUserCreatedNodes(bool* has_nodes) { |
DCHECK(backend_loop_.get()); |
DCHECK(backend_loop_->BelongsToCurrentThread()); |