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

Side by Side Diff: net/http/http_response_info.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/http/http_server_properties.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_response_info.h" 5 #include "net/http/http_response_info.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "net/base/auth.h" 10 #include "net/base/auth.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 if (ssl_info.security_bits != -1) 336 if (ssl_info.security_bits != -1)
337 pickle->WriteInt(ssl_info.security_bits); 337 pickle->WriteInt(ssl_info.security_bits);
338 if (ssl_info.connection_status != 0) 338 if (ssl_info.connection_status != 0)
339 pickle->WriteInt(ssl_info.connection_status); 339 pickle->WriteInt(ssl_info.connection_status);
340 if (!ssl_info.signed_certificate_timestamps.empty()) { 340 if (!ssl_info.signed_certificate_timestamps.empty()) {
341 pickle->WriteInt(ssl_info.signed_certificate_timestamps.size()); 341 pickle->WriteInt(ssl_info.signed_certificate_timestamps.size());
342 for (SignedCertificateTimestampAndStatusList::const_iterator it = 342 for (SignedCertificateTimestampAndStatusList::const_iterator it =
343 ssl_info.signed_certificate_timestamps.begin(); it != 343 ssl_info.signed_certificate_timestamps.begin(); it !=
344 ssl_info.signed_certificate_timestamps.end(); ++it) { 344 ssl_info.signed_certificate_timestamps.end(); ++it) {
345 it->sct->Persist(pickle); 345 it->sct->Persist(pickle);
346 pickle->WriteUInt16(it->status); 346 pickle->WriteUInt16(static_cast<uint16>(it->status));
347 } 347 }
348 } 348 }
349 } 349 }
350 350
351 if (vary_data.is_valid()) 351 if (vary_data.is_valid())
352 vary_data.Persist(pickle); 352 vary_data.Persist(pickle);
353 353
354 pickle->WriteString(socket_address.host()); 354 pickle->WriteString(socket_address.host());
355 pickle->WriteUInt16(socket_address.port()); 355 pickle->WriteUInt16(socket_address.port());
356 356
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 case CONNECTION_INFO_QUIC1_SPDY3: 407 case CONNECTION_INFO_QUIC1_SPDY3:
408 return "quic/1+spdy/3"; 408 return "quic/1+spdy/3";
409 case NUM_OF_CONNECTION_INFOS: 409 case NUM_OF_CONNECTION_INFOS:
410 break; 410 break;
411 } 411 }
412 NOTREACHED(); 412 NOTREACHED();
413 return ""; 413 return "";
414 } 414 }
415 415
416 } // namespace net 416 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket_pool_unittest.cc ('k') | net/http/http_server_properties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698