summaryrefslogtreecommitdiff
path: root/chromium/net/ssl/channel_id_store.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/ssl/channel_id_store.cc')
-rw-r--r--chromium/net/ssl/channel_id_store.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/ssl/channel_id_store.cc b/chromium/net/ssl/channel_id_store.cc
index 1345da13cbb..1d0078b968f 100644
--- a/chromium/net/ssl/channel_id_store.cc
+++ b/chromium/net/ssl/channel_id_store.cc
@@ -15,7 +15,7 @@ ChannelIDStore::ChannelID::ChannelID() {
ChannelIDStore::ChannelID::ChannelID(const std::string& server_identifier,
base::Time creation_time,
- scoped_ptr<crypto::ECPrivateKey> key)
+ std::unique_ptr<crypto::ECPrivateKey> key)
: server_identifier_(server_identifier),
creation_time_(creation_time),
key_(std::move(key)) {}
@@ -42,7 +42,7 @@ ChannelIDStore::ChannelID::~ChannelID() {}
void ChannelIDStore::InitializeFrom(const ChannelIDList& list) {
for (ChannelIDList::const_iterator i = list.begin(); i != list.end();
++i) {
- SetChannelID(scoped_ptr<ChannelID>(new ChannelID(*i)));
+ SetChannelID(std::unique_ptr<ChannelID>(new ChannelID(*i)));
}
}