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

Unified Diff: components/proximity_auth/remote_device_loader.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/remote_device_loader.h
diff --git a/components/proximity_auth/remote_device_loader.h b/components/proximity_auth/remote_device_loader.h
index 17229aab4636675652f7beeddef43e33c7698589..d60cc4b4050e9bf3dc135bdbe6af0af49db99f34 100644
--- a/components/proximity_auth/remote_device_loader.h
+++ b/components/proximity_auth/remote_device_loader.h
@@ -5,11 +5,11 @@
#ifndef COMPONENTS_PROXIMITY_REMOTE_DEVICE_LOADER_H
#define COMPONENTS_PROXIMITY_REMOTE_DEVICE_LOADER_H
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h"
#include "components/proximity_auth/remote_device.h"
@@ -34,7 +34,7 @@ class RemoteDeviceLoader {
const std::vector<cryptauth::ExternalDeviceInfo>& unlock_keys,
const std::string& user_id,
const std::string& user_private_key,
- scoped_ptr<SecureMessageDelegate> secure_message_delegate,
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate,
ProximityAuthPrefManager* pref_manager);
~RemoteDeviceLoader();
@@ -59,7 +59,7 @@ class RemoteDeviceLoader {
const std::string user_private_key_;
// Performs the PSK key derivation.
- scoped_ptr<SecureMessageDelegate> secure_message_delegate_;
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate_;
// Used to retrieve the address for BLE devices. Not owned.
ProximityAuthPrefManager* pref_manager_;
« no previous file with comments | « components/proximity_auth/remote_device_life_cycle_impl_unittest.cc ('k') | components/proximity_auth/remote_device_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698