diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-25 19:56:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 03:57:46 +0000 |
| commit | c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13 (patch) | |
| tree | 40b0bcb9cc341020cebfc29b2bcce331b034f5b3 /net/http/transport_security_state.cc | |
| parent | 09487931ca01d32ab254555b29c51d648f45be3c (diff) | |
| download | chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.zip chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.gz chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.bz2 | |
Convert Pass()→std::move() in //net
BUG=557422
R=avi@chromium.org
TBR=gavinp@chromium.org
Review URL: https://codereview.chromium.org/1545233002
Cr-Commit-Position: refs/heads/master@{#366889}
Diffstat (limited to 'net/http/transport_security_state.cc')
| -rw-r--r-- | net/http/transport_security_state.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index 5f2b010..e77c8c5 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -5,6 +5,7 @@ #include "net/http/transport_security_state.h" #include <algorithm> +#include <utility> #include "base/base64.h" #include "base/build_time.h" @@ -58,7 +59,7 @@ scoped_ptr<base::ListValue> GetPEMEncodedChainAsList( for (const std::string& cert : pem_encoded_chain) result->Append(make_scoped_ptr(new base::StringValue(cert))); - return result.Pass(); + return result; } bool HashReportForCache(const base::DictionaryValue& report, @@ -96,9 +97,10 @@ bool GetHPKPReport(const HostPortPair& host_port_pair, GetPEMEncodedChainAsList(served_certificate_chain); scoped_ptr<base::ListValue> validated_certificate_chain_list = GetPEMEncodedChainAsList(validated_certificate_chain); - report.Set("served-certificate-chain", served_certificate_chain_list.Pass()); + report.Set("served-certificate-chain", + std::move(served_certificate_chain_list)); report.Set("validated-certificate-chain", - validated_certificate_chain_list.Pass()); + std::move(validated_certificate_chain_list)); scoped_ptr<base::ListValue> known_pin_list(new base::ListValue()); for (const auto& hash_value : pkp_state.spki_hashes) { @@ -124,7 +126,7 @@ bool GetHPKPReport(const HostPortPair& host_port_pair, scoped_ptr<base::Value>(new base::StringValue(known_pin))); } - report.Set("known-pins", known_pin_list.Pass()); + report.Set("known-pins", std::move(known_pin_list)); // For the sent reports cache, do not include the effective expiration // date. The expiration date will likely change every time the user |