[Sync] Refactor sync datatype error handling.

chrome/browser/sync/glue/syncable_service_adapter.cc

Index: chrome/browser/sync/glue/syncable_service_adapter.cc
diff --git a/chrome/browser/sync/glue/syncable_service_adapter.cc b/chrome/browser/sync/glue/syncable_service_adapter.cc
index 68dcfae9b0f69880a1cbb7259a0f2de7cb5f56d2..8c12fdd2c69a65a5bf1439ce13df0502d0f0fe22 100644
--- a/chrome/browser/sync/glue/syncable_service_adapter.cc
+++ b/chrome/browser/sync/glue/syncable_service_adapter.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/sync/glue/syncable_service_adapter.h"
 
+#include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/glue/generic_change_processor.h"
@@ -30,18 +31,22 @@ SyncableServiceAdapter::~SyncableServiceAdapter() {
   }
 }
 
-bool SyncableServiceAdapter::AssociateModels() {
+bool SyncableServiceAdapter::AssociateModels(SyncError* error) {
   syncing_ = true;
   SyncDataList initial_sync_data;
-  if (!sync_processor_->GetSyncDataForType(type_, &initial_sync_data)) {
+  if (!sync_processor_->GetSyncDataForType(type_,
+                                           &initial_sync_data,
+                                           error)) {
     return false;
   }
+  DCHECK(!error->is_set());
   return service_->MergeDataAndStartSyncing(type_,
                                             initial_sync_data,
-                                            sync_processor_);
+                                            sync_processor_,
+                                            error);
 }
 
-bool SyncableServiceAdapter::DisassociateModels() {
+bool SyncableServiceAdapter::DisassociateModels(SyncError* error) {
   service_->StopSyncing(type_);
   syncing_ = false;
   return true;