Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: components/proximity_auth/unlock_manager.cc

Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/proximity_auth/unlock_manager.h ('k') | components/proximity_auth/unlock_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « components/proximity_auth/unlock_manager.h ('k') | components/proximity_auth/unlock_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698