Index: components/proximity_auth/unlock_manager.cc |
diff --git a/components/proximity_auth/unlock_manager.cc b/components/proximity_auth/unlock_manager.cc |
index fd206a7d5b8cf3a5e7847caa43bd837a553d87b1..1a276ad1f5c22a65e58e5148d54c3b648a471ffe 100644 |
--- a/components/proximity_auth/unlock_manager.cc |
+++ b/components/proximity_auth/unlock_manager.cc |
@@ -7,6 +7,7 @@ |
#include "base/bind.h" |
#include "base/location.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/thread_task_runner_handle.h" |
#include "base/time/default_tick_clock.h" |
#include "base/time/time.h" |
@@ -318,10 +319,10 @@ void UnlockManager::OnAuthAttempted( |
} |
} |
-scoped_ptr<ProximityMonitor> UnlockManager::CreateProximityMonitor( |
+std::unique_ptr<ProximityMonitor> UnlockManager::CreateProximityMonitor( |
const RemoteDevice& remote_device) { |
- return make_scoped_ptr(new ProximityMonitorImpl( |
- remote_device, make_scoped_ptr(new base::DefaultTickClock()))); |
+ return base::WrapUnique(new ProximityMonitorImpl( |
+ remote_device, base::WrapUnique(new base::DefaultTickClock()))); |
} |
void UnlockManager::SendSignInChallenge() { |