Index: components/password_manager/core/browser/password_syncable_service.h |
diff --git a/components/password_manager/core/browser/password_syncable_service.h b/components/password_manager/core/browser/password_syncable_service.h |
index 547df405c8c581e78a53d80b3e322124b0a9b02e..78d4ef62038f634c2bdf6da1af980f341651bb63 100644 |
--- a/components/password_manager/core/browser/password_syncable_service.h |
+++ b/components/password_manager/core/browser/password_syncable_service.h |
@@ -5,11 +5,11 @@ |
#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__ |
#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__ |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/threading/non_thread_safe.h" |
#include "components/password_manager/core/browser/password_store_change.h" |
#include "sync/api/sync_change.h" |
@@ -48,8 +48,8 @@ class PasswordSyncableService : public syncer::SyncableService, |
syncer::SyncMergeResult MergeDataAndStartSyncing( |
syncer::ModelType type, |
const syncer::SyncDataList& initial_sync_data, |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
- scoped_ptr<syncer::SyncErrorFactory> error_handler) override; |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) override; |
void StopSyncing(syncer::ModelType type) override; |
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; |
syncer::SyncError ProcessSyncChanges( |
@@ -102,10 +102,10 @@ class PasswordSyncableService : public syncer::SyncableService, |
// The factory that creates sync errors. |SyncError| has rich data |
// suitable for debugging. |
- scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; |
+ std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory_; |
// |sync_processor_| will mirror the |PasswordStore| changes in the sync db. |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_; |
// The password store that adds/updates/deletes password entries. Not owned. |
PasswordStoreSync* const password_store_; |