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

Unified Diff: content/common/ssl_status_serialization.cc

Issue 818833004: Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 | « content/common/resource_messages.cc ('k') | content/public/common/common_param_traits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/ssl_status_serialization.cc
diff --git a/content/common/ssl_status_serialization.cc b/content/common/ssl_status_serialization.cc
index d10b1b8a7e47a33cb967f41585a68d96b5626b6f..0e2e4d2d353a1d2ead8090e3319107b8d2300867 100644
--- a/content/common/ssl_status_serialization.cc
+++ b/content/common/ssl_status_serialization.cc
@@ -54,18 +54,17 @@ bool DeserializeSecurityInfo(
Pickle pickle(state.data(), static_cast<int>(state.size()));
PickleIterator iter(pickle);
int num_scts_to_read;
- if (!pickle.ReadInt(&iter, cert_id) ||
- !pickle.ReadUInt32(&iter, cert_status) ||
- !pickle.ReadInt(&iter, security_bits) ||
- !pickle.ReadInt(&iter, ssl_connection_status) ||
- !pickle.ReadInt(&iter, &num_scts_to_read))
+ if (!iter.ReadInt(cert_id) ||
+ !iter.ReadUInt32(cert_status) ||
+ !iter.ReadInt(security_bits) ||
+ !iter.ReadInt(ssl_connection_status) ||
+ !iter.ReadInt(&num_scts_to_read))
return false;
for (; num_scts_to_read > 0; --num_scts_to_read) {
int id;
uint16 status;
- if (!pickle.ReadInt(&iter, &id) ||
- !pickle.ReadUInt16(&iter, &status))
+ if (!iter.ReadInt(&id) || !iter.ReadUInt16(&status))
return false;
signed_certificate_timestamp_ids->push_back(
SignedCertificateTimestampIDAndStatus(
« no previous file with comments | « content/common/resource_messages.cc ('k') | content/public/common/common_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698