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

Unified Diff: components/proximity_auth/cryptauth/cryptauth_enroller_impl.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/cryptauth/cryptauth_enroller_impl.h
diff --git a/components/proximity_auth/cryptauth/cryptauth_enroller_impl.h b/components/proximity_auth/cryptauth/cryptauth_enroller_impl.h
index d34bf30a4d3107b7fca3696e963ab058b0043d1f..66eed8ecab81a216c660e741af13c1f9ec6102be 100644
--- a/components/proximity_auth/cryptauth/cryptauth_enroller_impl.h
+++ b/components/proximity_auth/cryptauth/cryptauth_enroller_impl.h
@@ -5,9 +5,10 @@
#ifndef COMPONENTS_PROXIMITY_AUTH_CRYPTAUTH_ENROLLER_IMPL_H
#define COMPONENTS_PROXIMITY_AUTH_CRYPTAUTH_ENROLLER_IMPL_H
+#include <memory>
+
#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/cryptauth_enroller.h"
#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h"
@@ -32,8 +33,8 @@ class CryptAuthEnrollerImpl : public CryptAuthEnroller {
// |client_factory| creates CryptAuthClient instances for making API calls.
// |crypto_delegate| is responsible for SecureMessage operations.
CryptAuthEnrollerImpl(
- scoped_ptr<CryptAuthClientFactory> client_factory,
- scoped_ptr<SecureMessageDelegate> secure_message_delegate);
+ std::unique_ptr<CryptAuthClientFactory> client_factory,
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate);
~CryptAuthEnrollerImpl() override;
// CryptAuthEnroller:
@@ -62,13 +63,13 @@ class CryptAuthEnrollerImpl : public CryptAuthEnroller {
void OnOuterSecureMessageCreated(const std::string& outer_message);
// Creates the CryptAuthClient instances to make API requests.
- scoped_ptr<CryptAuthClientFactory> client_factory_;
+ std::unique_ptr<CryptAuthClientFactory> client_factory_;
// Handles SecureMessage operations.
- scoped_ptr<SecureMessageDelegate> secure_message_delegate_;
+ std::unique_ptr<SecureMessageDelegate> secure_message_delegate_;
// The CryptAuthClient for the latest request.
- scoped_ptr<CryptAuthClient> cryptauth_client_;
+ std::unique_ptr<CryptAuthClient> cryptauth_client_;
// The ephemeral key-pair generated for a single enrollment.
std::string session_public_key_;

Powered by Google App Engine
This is Rietveld 408576698