| 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 88b6ab1f753903e1b5454c101bf3efa68cdda58c..4a73b1972f25f38be688873cc4771e480c8859ee 100644
|
| --- a/chrome/browser/sync/glue/syncable_service_adapter.cc
|
| +++ b/chrome/browser/sync/glue/syncable_service_adapter.cc
|
| @@ -39,6 +39,8 @@ bool SyncableServiceAdapter::AssociateModels(SyncError* error) {
|
| *error = temp_error;
|
| return false;
|
| }
|
| +
|
| + // TODO(zea): Have all datatypes take ownership of the sync_processor_.
|
| temp_error = service_->MergeDataAndStartSyncing(type_,
|
| initial_sync_data,
|
| sync_processor_);
|
| @@ -60,8 +62,7 @@ bool SyncableServiceAdapter::SyncModelHasUserCreatedNodes(bool* has_nodes) {
|
| }
|
|
|
| void SyncableServiceAdapter::AbortAssociation() {
|
| - service_->StopSyncing(type_);
|
| - syncing_ = false;
|
| + NOTIMPLEMENTED();
|
| }
|
|
|
| bool SyncableServiceAdapter::CryptoReadyIfNecessary() {
|
|
|