| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/log/net_log_util.h" | 5 #include "net/log/net_log_util.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 next_protos_string.append(","); | 454 next_protos_string.append(","); |
| 455 next_protos_string.append(SSLClientSocket::NextProtoToString(proto)); | 455 next_protos_string.append(SSLClientSocket::NextProtoToString(proto)); |
| 456 } | 456 } |
| 457 status_dict->SetString("next_protos", next_protos_string); | 457 status_dict->SetString("next_protos", next_protos_string); |
| 458 } | 458 } |
| 459 | 459 |
| 460 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_STATUS), | 460 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_STATUS), |
| 461 status_dict); | 461 status_dict); |
| 462 } | 462 } |
| 463 | 463 |
| 464 if (info_sources & NET_INFO_SPDY_ALT_PROTO_MAPPINGS) { | 464 if (info_sources & NET_INFO_SPDY_ALT_SVC_MAPPINGS) { |
| 465 const net::HttpServerProperties& http_server_properties = | 465 const net::HttpServerProperties& http_server_properties = |
| 466 *context->http_server_properties(); | 466 *context->http_server_properties(); |
| 467 net_info_dict->Set( | 467 net_info_dict->Set( |
| 468 NetInfoSourceToString(NET_INFO_SPDY_ALT_PROTO_MAPPINGS), | 468 NetInfoSourceToString(NET_INFO_SPDY_ALT_SVC_MAPPINGS), |
| 469 http_server_properties.GetAlternativeServiceInfoAsValue()); | 469 http_server_properties.GetAlternativeServiceInfoAsValue()); |
| 470 } | 470 } |
| 471 | 471 |
| 472 if (info_sources & NET_INFO_QUIC) { | 472 if (info_sources & NET_INFO_QUIC) { |
| 473 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC), | 473 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC), |
| 474 http_network_session->QuicInfoToValue()); | 474 http_network_session->QuicInfoToValue()); |
| 475 } | 475 } |
| 476 | 476 |
| 477 if (info_sources & NET_INFO_HTTP_CACHE) { | 477 if (info_sources & NET_INFO_HTTP_CACHE) { |
| 478 base::DictionaryValue* info_dict = new base::DictionaryValue(); | 478 base::DictionaryValue* info_dict = new base::DictionaryValue(); |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 | 537 |
| 538 net::NetLog::EntryData entry_data( | 538 net::NetLog::EntryData entry_data( |
| 539 net::NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), | 539 net::NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), |
| 540 net::NetLog::PHASE_BEGIN, request->creation_time(), &callback); | 540 net::NetLog::PHASE_BEGIN, request->creation_time(), &callback); |
| 541 NetLog::Entry entry(&entry_data, request->net_log().GetLogLevel()); | 541 NetLog::Entry entry(&entry_data, request->net_log().GetLogLevel()); |
| 542 observer->OnAddEntry(entry); | 542 observer->OnAddEntry(entry); |
| 543 } | 543 } |
| 544 } | 544 } |
| 545 | 545 |
| 546 } // namespace net | 546 } // namespace net |
| OLD | NEW |