Index: components/sync/base/cryptographer.cc |
diff --git a/components/sync/base/cryptographer.cc b/components/sync/base/cryptographer.cc |
index b6c130abb311878a9c39b5bf57215c04aa318a95..c585965969ffff2d3edc56e83663ba37b468e002 100644 |
--- a/components/sync/base/cryptographer.cc |
+++ b/components/sync/base/cryptographer.cc |
@@ -11,6 +11,7 @@ |
#include "base/base64.h" |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "components/sync/base/encryptor.h" |
#include "components/sync/protocol/nigori_specifics.pb.h" |
@@ -41,7 +42,8 @@ Cryptographer::Cryptographer(const Cryptographer& other) |
} |
if (other.pending_keys_) { |
- pending_keys_.reset(new sync_pb::EncryptedData(*(other.pending_keys_))); |
+ pending_keys_ = |
+ base::MakeUnique<sync_pb::EncryptedData>(*(other.pending_keys_)); |
} |
} |
@@ -230,7 +232,7 @@ void Cryptographer::SetDefaultKey(const std::string& key_name) { |
void Cryptographer::SetPendingKeys(const sync_pb::EncryptedData& encrypted) { |
DCHECK(!CanDecrypt(encrypted)); |
DCHECK(!encrypted.blob().empty()); |
- pending_keys_.reset(new sync_pb::EncryptedData(encrypted)); |
+ pending_keys_ = base::MakeUnique<sync_pb::EncryptedData>(encrypted); |
} |
const sync_pb::EncryptedData& Cryptographer::GetPendingKeys() const { |