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

Side by Side Diff: net/base/net_log_util.cc

Issue 665083009: ABANDONED Handle multiple AlternateProtocols for each HostPortPair. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: 18. Created 5 years, 9 months 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
OLDNEW
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/base/net_log_util.h" 5 #include "net/base/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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 const net::HttpServerProperties& http_server_properties = 470 const net::HttpServerProperties& http_server_properties =
471 *context->http_server_properties(); 471 *context->http_server_properties();
472 472
473 const net::AlternateProtocolMap& map = 473 const net::AlternateProtocolMap& map =
474 http_server_properties.alternate_protocol_map(); 474 http_server_properties.alternate_protocol_map();
475 475
476 for (net::AlternateProtocolMap::const_iterator it = map.begin(); 476 for (net::AlternateProtocolMap::const_iterator it = map.begin();
477 it != map.end(); ++it) { 477 it != map.end(); ++it) {
478 base::DictionaryValue* dict = new base::DictionaryValue(); 478 base::DictionaryValue* dict = new base::DictionaryValue();
479 dict->SetString("host_port_pair", it->first.ToString()); 479 dict->SetString("host_port_pair", it->first.ToString());
480 dict->SetString("alternate_protocol", it->second.ToString()); 480 dict->SetString("alternate_protocols",
481 AlternateProtocolsToString(it->second));
481 dict_list->Append(dict); 482 dict_list->Append(dict);
482 } 483 }
483 484
484 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_ALT_PROTO_MAPPINGS), 485 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_ALT_PROTO_MAPPINGS),
485 dict_list); 486 dict_list);
486 } 487 }
487 488
488 if (info_sources & NET_INFO_QUIC) { 489 if (info_sources & NET_INFO_QUIC) {
489 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC), 490 net_info_dict->Set(NetInfoSourceToString(NET_INFO_QUIC),
490 http_network_session->QuicInfoToValue()); 491 http_network_session->QuicInfoToValue());
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 request->net_log().source(), 557 request->net_log().source(),
557 net::NetLog::PHASE_BEGIN, 558 net::NetLog::PHASE_BEGIN,
558 request->creation_time(), 559 request->creation_time(),
559 &callback); 560 &callback);
560 NetLog::Entry entry(&entry_data, request->net_log().GetLogLevel()); 561 NetLog::Entry entry(&entry_data, request->net_log().GetLogLevel());
561 observer->OnAddEntry(entry); 562 observer->OnAddEntry(entry);
562 } 563 }
563 } 564 }
564 565
565 } // namespace net 566 } // namespace net
OLDNEW
« no previous file with comments | « components/cronet/android/url_request_context_adapter.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698