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

Unified Diff: components/proximity_auth/device_to_device_secure_context.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/device_to_device_secure_context.h
diff --git a/components/proximity_auth/device_to_device_secure_context.h b/components/proximity_auth/device_to_device_secure_context.h
index 41610a4f85bb9dcf21982e73c51ab2268c94406a..500895dd11cbe2be12eca55b35ff1aae7a6727a0 100644
--- a/components/proximity_auth/device_to_device_secure_context.h
+++ b/components/proximity_auth/device_to_device_secure_context.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_PROXIMITY_AUTH_DEVICE_TO_DEVICE_SECURE_CONTEXT_H
#define COMPONENTS_PROXIMITY_AUTH_DEVICE_TO_DEVICE_SECURE_CONTEXT_H
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/proximity_auth/secure_context.h"
@@ -22,7 +23,7 @@ class SecureMessageDelegate;
class DeviceToDeviceSecureContext : public SecureContext {
public:
DeviceToDeviceSecureContext(
- scoped_ptr<SecureMessageDelegate> secure_message_delegate,
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate,
const std::string& symmetric_key,
const std::string& responder_auth_message_,
ProtocolVersion protocol_version);
@@ -48,7 +49,7 @@ class DeviceToDeviceSecureContext : public SecureContext {
const securemessage::Header& header);
// Delegate for handling the creation and unwrapping of SecureMessages.
- scoped_ptr<SecureMessageDelegate> secure_message_delegate_;
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate_;
// The symmetric key used to create and unwrap messages.
const std::string symmetric_key_;

Powered by Google App Engine
This is Rietveld 408576698