| Index: chrome/browser/sync/glue/syncable_service_adapter.cc
|
| ===================================================================
|
| --- chrome/browser/sync/glue/syncable_service_adapter.cc (revision 105407)
|
| +++ chrome/browser/sync/glue/syncable_service_adapter.cc (working copy)
|
| @@ -39,10 +39,6 @@
|
| *error = temp_error;
|
| return false;
|
| }
|
| -
|
| - // TODO(zea): Have all datatypes take ownership of the sync_processor_.
|
| - // Further, refactor the DTC's to not need this class at all
|
| - // (crbug.com/100114).
|
| temp_error = service_->MergeDataAndStartSyncing(type_,
|
| initial_sync_data,
|
| sync_processor_);
|
| @@ -64,7 +60,8 @@
|
| }
|
|
|
| void SyncableServiceAdapter::AbortAssociation() {
|
| - NOTIMPLEMENTED();
|
| + service_->StopSyncing(type_);
|
| + syncing_ = false;
|
| }
|
|
|
| bool SyncableServiceAdapter::CryptoReadyIfNecessary() {
|
|
|