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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
443 if (info_sources & NET_INFO_SPDY_ALT_SVC_MAPPINGS) { | 443 if (info_sources & NET_INFO_SPDY_ALT_SVC_MAPPINGS) { |
444 const HttpServerProperties& http_server_properties = | 444 const HttpServerProperties& http_server_properties = |
445 *context->http_server_properties(); | 445 *context->http_server_properties(); |
446 net_info_dict->Set( | 446 net_info_dict->Set( |
447 NetInfoSourceToString(NET_INFO_SPDY_ALT_SVC_MAPPINGS), | 447 NetInfoSourceToString(NET_INFO_SPDY_ALT_SVC_MAPPINGS), |
448 http_server_properties.GetAlternativeServiceInfoAsValue()); | 448 http_server_properties.GetAlternativeServiceInfoAsValue()); |
449 } | 449 } |
450 | 450 |
451 if (info_sources & NET_INFO_QUIC) { | 451 if (info_sources & NET_INFO_QUIC) { |
452 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC), | 452 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC), |
453 http_network_session->QuicInfoToValue()); | 453 http_network_session->QuicInfoToValue().Pass()); |
eroman
2015/05/25 17:48:56
Remove .Pass()
payal.pandey
2015/05/26 06:24:15
Done.
| |
454 } | 454 } |
455 | 455 |
456 if (info_sources & NET_INFO_HTTP_CACHE) { | 456 if (info_sources & NET_INFO_HTTP_CACHE) { |
457 base::DictionaryValue* info_dict = new base::DictionaryValue(); | 457 base::DictionaryValue* info_dict = new base::DictionaryValue(); |
458 base::DictionaryValue* stats_dict = new base::DictionaryValue(); | 458 base::DictionaryValue* stats_dict = new base::DictionaryValue(); |
459 | 459 |
460 disk_cache::Backend* disk_cache = GetDiskCacheBackend(context); | 460 disk_cache::Backend* disk_cache = GetDiskCacheBackend(context); |
461 | 461 |
462 if (disk_cache) { | 462 if (disk_cache) { |
463 // Extract the statistics key/value pairs from the backend. | 463 // Extract the statistics key/value pairs from the backend. |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
515 // fine, since GetRequestStateAsValue() ignores the capture mode. | 515 // fine, since GetRequestStateAsValue() ignores the capture mode. |
516 NetLog::EntryData entry_data( | 516 NetLog::EntryData entry_data( |
517 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), | 517 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), |
518 NetLog::PHASE_BEGIN, request->creation_time(), &callback); | 518 NetLog::PHASE_BEGIN, request->creation_time(), &callback); |
519 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); | 519 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); |
520 observer->OnAddEntry(entry); | 520 observer->OnAddEntry(entry); |
521 } | 521 } |
522 } | 522 } |
523 | 523 |
524 } // namespace net | 524 } // namespace net |
OLD | NEW |