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

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

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 years, 4 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/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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 if (info_sources & NET_INFO_SPDY_SESSIONS) { 410 if (info_sources & NET_INFO_SPDY_SESSIONS) {
411 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_SESSIONS), 411 net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_SESSIONS),
412 http_network_session->SpdySessionPoolInfoToValue()); 412 http_network_session->SpdySessionPoolInfoToValue());
413 } 413 }
414 414
415 if (info_sources & NET_INFO_SPDY_STATUS) { 415 if (info_sources & NET_INFO_SPDY_STATUS) {
416 base::DictionaryValue* status_dict = new base::DictionaryValue(); 416 base::DictionaryValue* status_dict = new base::DictionaryValue();
417 417
418 status_dict->SetBoolean("spdy_enabled", HttpStreamFactory::spdy_enabled()); 418 status_dict->SetBoolean("spdy_enabled", HttpStreamFactory::spdy_enabled());
419 status_dict->SetBoolean( 419 status_dict->SetBoolean(
420 "use_alternate_protocols", 420 "use_alternative_services",
421 http_network_session->params().use_alternate_protocols); 421 http_network_session->params().use_alternative_services);
422 422
423 NextProtoVector next_protos; 423 NextProtoVector next_protos;
424 http_network_session->GetNextProtos(&next_protos); 424 http_network_session->GetNextProtos(&next_protos);
425 if (!next_protos.empty()) { 425 if (!next_protos.empty()) {
426 std::string next_protos_string; 426 std::string next_protos_string;
427 for (const NextProto proto : next_protos) { 427 for (const NextProto proto : next_protos) {
428 if (!next_protos_string.empty()) 428 if (!next_protos_string.empty())
429 next_protos_string.append(","); 429 next_protos_string.append(",");
430 next_protos_string.append(SSLClientSocket::NextProtoToString(proto)); 430 next_protos_string.append(SSLClientSocket::NextProtoToString(proto));
431 } 431 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // fine, since GetRequestStateAsValue() ignores the capture mode. 511 // fine, since GetRequestStateAsValue() ignores the capture mode.
512 NetLog::EntryData entry_data( 512 NetLog::EntryData entry_data(
513 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), 513 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(),
514 NetLog::PHASE_BEGIN, request->creation_time(), &callback); 514 NetLog::PHASE_BEGIN, request->creation_time(), &callback);
515 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); 515 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default());
516 observer->OnAddEntry(entry); 516 observer->OnAddEntry(entry);
517 } 517 }
518 } 518 }
519 519
520 } // namespace net 520 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698