Update from https://crrev.com/309717

net/quic/crypto/quic_server_info.cc

Index: net/quic/crypto/quic_server_info.cc
diff --git a/net/quic/crypto/quic_server_info.cc b/net/quic/crypto/quic_server_info.cc
index 519d7b5fd6015bd2c0a42b2c7148fc06b125ea91..c86d1f63c107ef2264eb4a8196f84e04f5e2a080 100644
--- a/net/quic/crypto/quic_server_info.cc
+++ b/net/quic/crypto/quic_server_info.cc
@@ -67,7 +67,7 @@ bool QuicServerInfo::ParseInner(const string& data) {
   PickleIterator iter(p);
 
   int version = -1;
-  if (!p.ReadInt(&iter, &version)) {
+  if (!iter.ReadInt(&version)) {
     DVLOG(1) << "Missing version";
     return false;
   }
@@ -77,29 +77,29 @@ bool QuicServerInfo::ParseInner(const string& data) {
     return false;
   }
 
-  if (!p.ReadString(&iter, &state->server_config)) {
+  if (!iter.ReadString(&state->server_config)) {
     DVLOG(1) << "Malformed server_config";
     return false;
   }
-  if (!p.ReadString(&iter, &state->source_address_token)) {
+  if (!iter.ReadString(&state->source_address_token)) {
     DVLOG(1) << "Malformed source_address_token";
     return false;
   }
-  if (!p.ReadString(&iter, &state->server_config_sig)) {
+  if (!iter.ReadString(&state->server_config_sig)) {
     DVLOG(1) << "Malformed server_config_sig";
     return false;
   }
 
   // Read certs.
   uint32 num_certs;
-  if (!p.ReadUInt32(&iter, &num_certs)) {
+  if (!iter.ReadUInt32(&num_certs)) {
     DVLOG(1) << "Malformed num_certs";
     return false;
   }
 
   for (uint32 i = 0; i < num_certs; i++) {
     string cert;
-    if (!p.ReadString(&iter, &cert)) {
+    if (!iter.ReadString(&cert)) {
       DVLOG(1) << "Malformed cert";
       return false;
     }