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

Unified Diff: components/proximity_auth/unlock_manager.h

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
Index: components/proximity_auth/unlock_manager.h
diff --git a/components/proximity_auth/unlock_manager.h b/components/proximity_auth/unlock_manager.h
index d513a2cfebcf176748ed8e456d09fc18e13b169a..2a6602a001bd198b76cae85ccd1a0f486111a535 100644
--- a/components/proximity_auth/unlock_manager.h
+++ b/components/proximity_auth/unlock_manager.h
@@ -62,7 +62,7 @@ class UnlockManager : public MessengerObserver,
protected:
// Creates a ProximityMonitor instance for the given |remote_device|.
// Exposed for testing.
- virtual scoped_ptr<ProximityMonitor> CreateProximityMonitor(
+ virtual std::unique_ptr<ProximityMonitor> CreateProximityMonitor(
const RemoteDevice& remote_device);
private:
@@ -146,7 +146,7 @@ class UnlockManager : public MessengerObserver,
// Whether the user is present at the remote device. Unset if no remote status
// update has yet been received.
- scoped_ptr<RemoteScreenlockState> remote_screenlock_state_;
+ std::unique_ptr<RemoteScreenlockState> remote_screenlock_state_;
// Controls the proximity auth flow logic for a remote device. Not owned, and
// expcted to outlive |this| instance.
@@ -154,7 +154,7 @@ class UnlockManager : public MessengerObserver,
// Tracks whether the remote device is currently in close enough proximity to
// the local device to allow unlocking.
- scoped_ptr<ProximityMonitor> proximity_monitor_;
+ std::unique_ptr<ProximityMonitor> proximity_monitor_;
// Used to call into the embedder. Expected to outlive |this| instance.
ProximityAuthClient* proximity_auth_client_;
@@ -175,7 +175,7 @@ class UnlockManager : public MessengerObserver,
// The sign-in secret received from the remote device by decrypting the
// sign-in challenge.
- scoped_ptr<std::string> sign_in_secret_;
+ std::unique_ptr<std::string> sign_in_secret_;
// The state of the current screen lock UI.
ScreenlockState screenlock_state_;

Powered by Google App Engine
This is Rietveld 408576698