| Index: components/password_manager/core/browser/password_syncable_service.cc
|
| diff --git a/components/password_manager/core/browser/password_syncable_service.cc b/components/password_manager/core/browser/password_syncable_service.cc
|
| index 9d82deab010f87b1b6d83b4525532d3c502e77e2..5eda9433b430a9cf49fe86c6def67331464e60ca 100644
|
| --- a/components/password_manager/core/browser/password_syncable_service.cc
|
| +++ b/components/password_manager/core/browser/password_syncable_service.cc
|
| @@ -145,8 +145,8 @@ PasswordSyncableService::~PasswordSyncableService() {
|
| syncer::SyncMergeResult PasswordSyncableService::MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| - scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| - scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
|
| + std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| + std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK_EQ(syncer::PASSWORDS, type);
|
| base::AutoReset<bool> processing_changes(&is_processing_sync_changes_, true);
|
|
|