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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
405 | 405 |
406 HttpNetworkSession* http_network_session = | 406 HttpNetworkSession* http_network_session = |
407 context->http_transaction_factory()->GetSession(); | 407 context->http_transaction_factory()->GetSession(); |
408 | 408 |
409 if (info_sources & NET_INFO_SOCKET_POOL) { | 409 if (info_sources & NET_INFO_SOCKET_POOL) { |
410 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SOCKET_POOL), | 410 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SOCKET_POOL), |
411 http_network_session->SocketPoolInfoToValue()); | 411 http_network_session->SocketPoolInfoToValue()); |
412 } | 412 } |
413 | 413 |
414 if (info_sources & NET_INFO_SPDY_SESSIONS) { | 414 if (info_sources & NET_INFO_SPDY_SESSIONS) { |
415 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_SESSIONS), | 415 net_info_dict->Set( |
416 http_network_session->SpdySessionPoolInfoToValue()); | 416 NetInfoSourceToString(NET_INFO_SPDY_SESSIONS), |
417 http_network_session->SpdySessionPoolInfoToValue().Pass()); | |
eroman
2015/05/25 17:50:46
Same comment as on other changelist -- there is no
payal.pandey
2015/05/26 06:07:35
Acknowledged.
payal.pandey
2015/05/26 06:07:35
Done.
| |
417 } | 418 } |
418 | 419 |
419 if (info_sources & NET_INFO_SPDY_STATUS) { | 420 if (info_sources & NET_INFO_SPDY_STATUS) { |
420 base::DictionaryValue* status_dict = new base::DictionaryValue(); | 421 base::DictionaryValue* status_dict = new base::DictionaryValue(); |
421 | 422 |
422 status_dict->SetBoolean("spdy_enabled", HttpStreamFactory::spdy_enabled()); | 423 status_dict->SetBoolean("spdy_enabled", HttpStreamFactory::spdy_enabled()); |
423 status_dict->SetBoolean( | 424 status_dict->SetBoolean( |
424 "use_alternate_protocols", | 425 "use_alternate_protocols", |
425 http_network_session->params().use_alternate_protocols); | 426 http_network_session->params().use_alternate_protocols); |
426 | 427 |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
515 // fine, since GetRequestStateAsValue() ignores the capture mode. | 516 // fine, since GetRequestStateAsValue() ignores the capture mode. |
516 NetLog::EntryData entry_data( | 517 NetLog::EntryData entry_data( |
517 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), | 518 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), |
518 NetLog::PHASE_BEGIN, request->creation_time(), &callback); | 519 NetLog::PHASE_BEGIN, request->creation_time(), &callback); |
519 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); | 520 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); |
520 observer->OnAddEntry(entry); | 521 observer->OnAddEntry(entry); |
521 } | 522 } |
522 } | 523 } |
523 | 524 |
524 } // namespace net | 525 } // namespace net |
OLD | NEW |