| Index: net/http/http_cache_transaction.cc
|
| diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
|
| index aba792330bf4dcf92e78deeb88ff44ff88fc663f..34b83355ce14a31c569b64f384d66c01b8bfd18d 100644
|
| --- a/net/http/http_cache_transaction.cc
|
| +++ b/net/http/http_cache_transaction.cc
|
| @@ -1826,11 +1826,11 @@ void HttpCache::Transaction::ReadCertChain() {
|
|
|
| scoped_refptr<SharedChainData> shared_chain_data(
|
| new SharedChainData(intermediates.size() + 1, TimeTicks::Now()));
|
| - cache_->cert_cache()->Get(key,
|
| - base::Bind(&OnCertReadIOComplete,
|
| - dist_from_root,
|
| - true /* is leaf */,
|
| - shared_chain_data));
|
| + cache_->cert_cache()->GetCertificate(key,
|
| + base::Bind(&OnCertReadIOComplete,
|
| + dist_from_root,
|
| + true /* is leaf */,
|
| + shared_chain_data));
|
|
|
| for (X509Certificate::OSCertHandles::const_iterator it =
|
| intermediates.begin();
|
| @@ -1838,11 +1838,11 @@ void HttpCache::Transaction::ReadCertChain() {
|
| ++it) {
|
| --dist_from_root;
|
| key = GetCacheKeyForCert(*it);
|
| - cache_->cert_cache()->Get(key,
|
| - base::Bind(&OnCertReadIOComplete,
|
| - dist_from_root,
|
| - false /* is not leaf */,
|
| - shared_chain_data));
|
| + cache_->cert_cache()->GetCertificate(key,
|
| + base::Bind(&OnCertReadIOComplete,
|
| + dist_from_root,
|
| + false /* is not leaf */,
|
| + shared_chain_data));
|
| }
|
| DCHECK_EQ(0, dist_from_root);
|
| }
|
| @@ -1854,21 +1854,22 @@ void HttpCache::Transaction::WriteCertChain() {
|
|
|
| scoped_refptr<SharedChainData> shared_chain_data(
|
| new SharedChainData(intermediates.size() + 1, TimeTicks::Now()));
|
| - cache_->cert_cache()->Set(response_.ssl_info.cert->os_cert_handle(),
|
| - base::Bind(&OnCertWriteIOComplete,
|
| - dist_from_root,
|
| - true /* is leaf */,
|
| - shared_chain_data));
|
| + cache_->cert_cache()->SetCertificate(
|
| + response_.ssl_info.cert->os_cert_handle(),
|
| + base::Bind(&OnCertWriteIOComplete,
|
| + dist_from_root,
|
| + true /* is leaf */,
|
| + shared_chain_data));
|
| for (X509Certificate::OSCertHandles::const_iterator it =
|
| intermediates.begin();
|
| it != intermediates.end();
|
| ++it) {
|
| --dist_from_root;
|
| - cache_->cert_cache()->Set(*it,
|
| - base::Bind(&OnCertWriteIOComplete,
|
| - dist_from_root,
|
| - false /* is not leaf */,
|
| - shared_chain_data));
|
| + cache_->cert_cache()->SetCertificate(*it,
|
| + base::Bind(&OnCertWriteIOComplete,
|
| + dist_from_root,
|
| + false /* is not leaf */,
|
| + shared_chain_data));
|
| }
|
| DCHECK_EQ(0, dist_from_root);
|
| }
|
| @@ -1884,7 +1885,7 @@ void HttpCache::Transaction::SetRequest(const BoundNetLog& net_log,
|
| break;
|
| case RECORD:
|
| // When in record mode, we want to NEVER load from the cache.
|
| - // The reason for this is beacuse we save the Set-Cookie headers
|
| + // The reason for this is because we save the Set-Cookie headers
|
| // (intentionally). If we read from the cache, we replay them
|
| // prematurely.
|
| effective_load_flags_ |= LOAD_BYPASS_CACHE;
|
|
|