Index: chrome/browser/sync/glue/non_ui_data_type_controller.cc |
diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller.cc b/chrome/browser/sync/glue/non_ui_data_type_controller.cc |
index 48c30237375528c5d3769434a7f673ee054dc618..d8192f3004a8f5a3e6687be091bd4823337c287e 100644 |
--- a/chrome/browser/sync/glue/non_ui_data_type_controller.cc |
+++ b/chrome/browser/sync/glue/non_ui_data_type_controller.cc |
@@ -364,7 +364,8 @@ void NonUIDataTypeController:: |
base::TimeTicks start_time = base::TimeTicks::Now(); |
syncer::SyncDataList initial_sync_data; |
syncer::SyncError error = |
- shared_change_processor->GetSyncData(&initial_sync_data); |
+ shared_change_processor_->GetAllSyncDataReturnError( |
+ type(), &initial_sync_data); |
Nicolas Zea
2013/09/05 00:13:08
nit: fix indent
tim (not reviewing)
2013/09/05 00:22:24
Done.
|
if (error.IsSet()) { |
local_merge_result.set_error(error); |
StartDone(ASSOCIATION_FAILED, |