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

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

Issue 2011983002: Remove |parse_alternative_service| flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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 <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 429
430 if (info_sources & NET_INFO_SPDY_STATUS) { 430 if (info_sources & NET_INFO_SPDY_STATUS) {
431 base::DictionaryValue* status_dict = new base::DictionaryValue(); 431 base::DictionaryValue* status_dict = new base::DictionaryValue();
432 432
433 status_dict->SetBoolean("enable_spdy31", 433 status_dict->SetBoolean("enable_spdy31",
434 http_network_session->params().enable_spdy31 && 434 http_network_session->params().enable_spdy31 &&
435 HttpStreamFactory::spdy_enabled()); 435 HttpStreamFactory::spdy_enabled());
436 status_dict->SetBoolean("enable_http2", 436 status_dict->SetBoolean("enable_http2",
437 http_network_session->params().enable_http2 && 437 http_network_session->params().enable_http2 &&
438 HttpStreamFactory::spdy_enabled()); 438 HttpStreamFactory::spdy_enabled());
439 status_dict->SetBoolean(
440 "use_alternative_services",
441 http_network_session->params().parse_alternative_services);
442 439
443 NextProtoVector alpn_protos; 440 NextProtoVector alpn_protos;
444 http_network_session->GetAlpnProtos(&alpn_protos); 441 http_network_session->GetAlpnProtos(&alpn_protos);
445 if (!alpn_protos.empty()) { 442 if (!alpn_protos.empty()) {
446 std::string next_protos_string; 443 std::string next_protos_string;
447 for (NextProto proto : alpn_protos) { 444 for (NextProto proto : alpn_protos) {
448 if (!next_protos_string.empty()) 445 if (!next_protos_string.empty())
449 next_protos_string.append(","); 446 next_protos_string.append(",");
450 next_protos_string.append(SSLClientSocket::NextProtoToString(proto)); 447 next_protos_string.append(SSLClientSocket::NextProtoToString(proto));
451 } 448 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 // fine, since GetRequestStateAsValue() ignores the capture mode. 540 // fine, since GetRequestStateAsValue() ignores the capture mode.
544 NetLog::EntryData entry_data( 541 NetLog::EntryData entry_data(
545 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(), 542 NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(),
546 NetLog::PHASE_BEGIN, request->creation_time(), &callback); 543 NetLog::PHASE_BEGIN, request->creation_time(), &callback);
547 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default()); 544 NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default());
548 observer->OnAddEntry(entry); 545 observer->OnAddEntry(entry);
549 } 546 }
550 } 547 }
551 548
552 } // namespace net 549 } // 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