| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/ssl/channel_id_store.h" |
| 6 |
| 7 #include <utility> |
| 8 |
| 5 #include "crypto/ec_private_key.h" | 9 #include "crypto/ec_private_key.h" |
| 6 #include "net/ssl/channel_id_store.h" | |
| 7 | 10 |
| 8 namespace net { | 11 namespace net { |
| 9 | 12 |
| 10 ChannelIDStore::ChannelID::ChannelID() { | 13 ChannelIDStore::ChannelID::ChannelID() { |
| 11 } | 14 } |
| 12 | 15 |
| 13 ChannelIDStore::ChannelID::ChannelID(const std::string& server_identifier, | 16 ChannelIDStore::ChannelID::ChannelID(const std::string& server_identifier, |
| 14 base::Time creation_time, | 17 base::Time creation_time, |
| 15 scoped_ptr<crypto::ECPrivateKey> key) | 18 scoped_ptr<crypto::ECPrivateKey> key) |
| 16 : server_identifier_(server_identifier), | 19 : server_identifier_(server_identifier), |
| 17 creation_time_(creation_time), | 20 creation_time_(creation_time), |
| 18 key_(key.Pass()) { | 21 key_(std::move(key)) {} |
| 19 } | |
| 20 | 22 |
| 21 ChannelIDStore::ChannelID::ChannelID(const ChannelID& other) | 23 ChannelIDStore::ChannelID::ChannelID(const ChannelID& other) |
| 22 : server_identifier_(other.server_identifier_), | 24 : server_identifier_(other.server_identifier_), |
| 23 creation_time_(other.creation_time_), | 25 creation_time_(other.creation_time_), |
| 24 key_(other.key_ ? other.key_->Copy() : nullptr) { | 26 key_(other.key_ ? other.key_->Copy() : nullptr) { |
| 25 } | 27 } |
| 26 | 28 |
| 27 ChannelIDStore::ChannelID& ChannelIDStore::ChannelID::operator=( | 29 ChannelIDStore::ChannelID& ChannelIDStore::ChannelID::operator=( |
| 28 const ChannelID& other) { | 30 const ChannelID& other) { |
| 29 if (&other == this) | 31 if (&other == this) |
| 30 return *this; | 32 return *this; |
| 31 server_identifier_ = other.server_identifier_; | 33 server_identifier_ = other.server_identifier_; |
| 32 creation_time_ = other.creation_time_; | 34 creation_time_ = other.creation_time_; |
| 33 if (other.key_) | 35 if (other.key_) |
| 34 key_.reset(other.key_->Copy()); | 36 key_.reset(other.key_->Copy()); |
| 35 return *this; | 37 return *this; |
| 36 } | 38 } |
| 37 | 39 |
| 38 ChannelIDStore::ChannelID::~ChannelID() {} | 40 ChannelIDStore::ChannelID::~ChannelID() {} |
| 39 | 41 |
| 40 void ChannelIDStore::InitializeFrom(const ChannelIDList& list) { | 42 void ChannelIDStore::InitializeFrom(const ChannelIDList& list) { |
| 41 for (ChannelIDList::const_iterator i = list.begin(); i != list.end(); | 43 for (ChannelIDList::const_iterator i = list.begin(); i != list.end(); |
| 42 ++i) { | 44 ++i) { |
| 43 SetChannelID(scoped_ptr<ChannelID>(new ChannelID(*i))); | 45 SetChannelID(scoped_ptr<ChannelID>(new ChannelID(*i))); |
| 44 } | 46 } |
| 45 } | 47 } |
| 46 | 48 |
| 47 } // namespace net | 49 } // namespace net |
| OLD | NEW |