Index: components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc |
diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc |
index 52b288c2e5068b0ea81946810a37eec5f6ff3307..91d3129ef51eff48ba7a9f3d71fd7c3326d8ef25 100644 |
--- a/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc |
+++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_manager.cc |
@@ -7,6 +7,7 @@ |
#include <utility> |
#include "base/base64url.h" |
+#include "base/memory/ptr_util.h" |
#include "base/time/clock.h" |
#include "base/time/time.h" |
#include "components/prefs/pref_registry_simple.h" |
@@ -44,9 +45,9 @@ const char kDeviceSoftwarePackage[] = "com.google.chrome.cryptauth"; |
} // namespace |
CryptAuthEnrollmentManager::CryptAuthEnrollmentManager( |
- scoped_ptr<base::Clock> clock, |
- scoped_ptr<CryptAuthEnrollerFactory> enroller_factory, |
- scoped_ptr<SecureMessageDelegate> secure_message_delegate, |
+ std::unique_ptr<base::Clock> clock, |
+ std::unique_ptr<CryptAuthEnrollerFactory> enroller_factory, |
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate, |
const cryptauth::GcmDeviceInfo& device_info, |
CryptAuthGCMManager* gcm_manager, |
PrefService* pref_service) |
@@ -157,8 +158,9 @@ void CryptAuthEnrollmentManager::OnEnrollmentFinished(bool success) { |
FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentFinished(success)); |
} |
-scoped_ptr<SyncScheduler> CryptAuthEnrollmentManager::CreateSyncScheduler() { |
- return make_scoped_ptr(new SyncSchedulerImpl( |
+std::unique_ptr<SyncScheduler> |
+CryptAuthEnrollmentManager::CreateSyncScheduler() { |
+ return base::WrapUnique(new SyncSchedulerImpl( |
this, base::TimeDelta::FromDays(kEnrollmentRefreshPeriodDays), |
base::TimeDelta::FromMinutes(kEnrollmentBaseRecoveryPeriodMinutes), |
kEnrollmentMaxJitterRatio, "CryptAuth Enrollment")); |
@@ -227,7 +229,7 @@ void CryptAuthEnrollmentManager::OnReenrollMessage() { |
} |
void CryptAuthEnrollmentManager::OnSyncRequested( |
- scoped_ptr<SyncScheduler::SyncRequest> sync_request) { |
+ std::unique_ptr<SyncScheduler::SyncRequest> sync_request) { |
FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentStarted()); |
sync_request_ = std::move(sync_request); |