| Index: chrome/browser/sync/api/fake_syncable_service.cc
|
| diff --git a/chrome/browser/sync/api/fake_syncable_service.cc b/chrome/browser/sync/api/fake_syncable_service.cc
|
| index 9823dbd1b551481c8e88b1efb3d24f268d058ccf..2f7d94807a909cf7fc25da065ee59cc69fe05a7f 100644
|
| --- a/chrome/browser/sync/api/fake_syncable_service.cc
|
| +++ b/chrome/browser/sync/api/fake_syncable_service.cc
|
| @@ -30,8 +30,8 @@ bool FakeSyncableService::syncing() const {
|
| SyncError FakeSyncableService::MergeDataAndStartSyncing(
|
| syncable::ModelType type,
|
| const SyncDataList& initial_sync_data,
|
| - SyncChangeProcessor* sync_processor) {
|
| - sync_processor_.reset(sync_processor);
|
| + scoped_ptr<SyncChangeProcessor> sync_processor) {
|
| + sync_processor_ = sync_processor.Pass();
|
| type_ = type;
|
| if (!merge_data_and_start_syncing_error_.IsSet()) {
|
| syncing_ = true;
|
| @@ -41,6 +41,7 @@ SyncError FakeSyncableService::MergeDataAndStartSyncing(
|
|
|
| void FakeSyncableService::StopSyncing(syncable::ModelType type) {
|
| syncing_ = false;
|
| + sync_processor_.reset();
|
| }
|
|
|
| SyncDataList FakeSyncableService::GetAllSyncData(
|
|
|