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

Unified Diff: net/quic/chromium/quic_stream_factory.cc

Issue 2373663002: Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Fix compile errors. Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: net/quic/chromium/quic_stream_factory.cc
diff --git a/net/quic/chromium/quic_stream_factory.cc b/net/quic/chromium/quic_stream_factory.cc
index 339ea7e81934fc7172b51bdac91ff2b1aadff45e..0223d6340160184db8370238e5ca8fb55e9ef5cc 100644
--- a/net/quic/chromium/quic_stream_factory.cc
+++ b/net/quic/chromium/quic_stream_factory.cc
@@ -50,6 +50,7 @@
#include "net/quic/core/quic_crypto_client_stream_factory.h"
#include "net/quic/core/quic_flags.h"
#include "net/socket/client_socket_factory.h"
+#include "net/socket/next_proto.h"
#include "net/socket/socket_performance_watcher.h"
#include "net/socket/socket_performance_watcher_factory.h"
#include "net/ssl/token_binding.h"
@@ -1740,7 +1741,7 @@ int64_t QuicStreamFactory::GetServerNetworkStatsSmoothedRttInMicroseconds(
bool QuicStreamFactory::WasQuicRecentlyBroken(
const QuicServerId& server_id) const {
- const AlternativeService alternative_service(QUIC,
+ const AlternativeService alternative_service(kProtoQUIC,
server_id.host_port_pair());
return http_server_properties_->WasAlternativeServiceRecentlyBroken(
alternative_service);
@@ -1834,7 +1835,7 @@ void QuicStreamFactory::MaybeInitialize() {
HostPortPair host_port_pair(key_value.first.host(), key_value.first.port());
for (const AlternativeServiceInfo& alternative_service_info :
key_value.second) {
- if (alternative_service_info.alternative_service.protocol == QUIC) {
+ if (alternative_service_info.alternative_service.protocol == kProtoQUIC) {
quic_supported_servers_at_startup_.insert(host_port_pair);
break;
}
@@ -1872,7 +1873,7 @@ void QuicStreamFactory::ProcessGoingAwaySession(
return;
const QuicConnectionStats& stats = session->connection()->GetStats();
- const AlternativeService alternative_service(QUIC,
+ const AlternativeService alternative_service(kProtoQUIC,
server_id.host_port_pair());
if (session->IsCryptoHandshakeConfirmed()) {
http_server_properties_->ConfirmAlternativeService(alternative_service);
« no previous file with comments | « net/quic/chromium/quic_network_transaction_unittest.cc ('k') | net/quic/chromium/quic_stream_factory_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698