Index: chrome/browser/webdata/autofill_profile_syncable_service.cc |
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc |
index f73a6618d8b94f842a1661afd4e89aa93c91b5bd..fe1222d203921e17fa2ffa694a595182490e7a62 100644 |
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc |
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc |
@@ -59,9 +59,10 @@ AutofillProfileSyncableService::AutofillProfileSyncableService() |
SyncError AutofillProfileSyncableService::MergeDataAndStartSyncing( |
syncable::ModelType type, |
const SyncDataList& initial_sync_data, |
- SyncChangeProcessor* sync_processor) { |
+ scoped_ptr<SyncChangeProcessor> sync_processor) { |
DCHECK(CalledOnValidThread()); |
DCHECK(!sync_processor_.get()); |
+ DCHECK(sync_processor.get()); |
DVLOG(1) << "Associating Autofill: MergeDataAndStartSyncing"; |
if (!LoadAutofillData(&profiles_.get())) { |
@@ -84,7 +85,7 @@ SyncError AutofillProfileSyncableService::MergeDataAndStartSyncing( |
} |
} |
- sync_processor_.reset(sync_processor); |
+ sync_processor_ = sync_processor.Pass(); |
GUIDToProfileMap remaining_profiles; |
CreateGUIDToProfileMap(profiles_.get(), &remaining_profiles); |