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

Unified Diff: sync/util/nigori.h

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: sync/util/nigori.h
diff --git a/sync/util/nigori.h b/sync/util/nigori.h
index 20769777476c02140f8158af91aef72f8d1df935..61dabbe056fee7c4cc7f353bfee5498251f37c5d 100644
--- a/sync/util/nigori.h
+++ b/sync/util/nigori.h
@@ -7,9 +7,9 @@
#include <stddef.h>
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "sync/base/sync_export.h"
namespace crypto {
@@ -78,9 +78,9 @@ class SYNC_EXPORT Nigori {
static const size_t kSigningIterations = 1004;
private:
- scoped_ptr<crypto::SymmetricKey> user_key_;
- scoped_ptr<crypto::SymmetricKey> encryption_key_;
- scoped_ptr<crypto::SymmetricKey> mac_key_;
+ std::unique_ptr<crypto::SymmetricKey> user_key_;
+ std::unique_ptr<crypto::SymmetricKey> encryption_key_;
+ std::unique_ptr<crypto::SymmetricKey> mac_key_;
};
} // namespace syncer

Powered by Google App Engine
This is Rietveld 408576698