Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: net/cert/x509_certificate.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/x509_certificate.h ('k') | net/cert/x509_certificate_ios.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_certificate.cc
diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc
index 2b0a10a33a9347dab436ee5b7bd5e3cda774a790..7d1b47f591877460441552e1da1a732c7f4f8e03 100644
--- a/net/cert/x509_certificate.cc
+++ b/net/cert/x509_certificate.cc
@@ -312,8 +312,9 @@ X509Certificate* X509Certificate::CreateFromBytes(const char* data,
}
// static
-X509Certificate* X509Certificate::CreateFromPickle(PickleIterator* pickle_iter,
- PickleType type) {
+X509Certificate* X509Certificate::CreateFromPickle(
+ base::PickleIterator* pickle_iter,
+ PickleType type) {
if (type == PICKLETYPE_CERTIFICATE_CHAIN_V3) {
int chain_length = 0;
if (!pickle_iter->ReadLength(&chain_length))
@@ -359,7 +360,7 @@ X509Certificate* X509Certificate::CreateFromPickle(PickleIterator* pickle_iter,
// bits of zeroes. Now we always write 32 bits, so after a while, these old
// cached pickles will all get replaced.
// TODO(mdm): remove this compatibility code in April 2013 or so.
- PickleIterator saved_iter = *pickle_iter;
+ base::PickleIterator saved_iter = *pickle_iter;
uint32 zero_check = 0;
if (!pickle_iter->ReadUInt32(&zero_check)) {
// This may not be an error. If there are no intermediates, and we're
@@ -473,7 +474,7 @@ CertificateList X509Certificate::CreateCertificateListFromBytes(
return results;
}
-void X509Certificate::Persist(Pickle* pickle) {
+void X509Certificate::Persist(base::Pickle* pickle) {
DCHECK(cert_handle_);
// This would be an absolutely insane number of intermediates.
if (intermediate_ca_certs_.size() > static_cast<size_t>(INT_MAX) - 1) {
« no previous file with comments | « net/cert/x509_certificate.h ('k') | net/cert/x509_certificate_ios.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698