s/NPN/ALPN/
s/RESPONSE_INFO_HAS_NPN_NEGOTIATED_PROTOCOL/RESPONSE_INFO_HAS_ALPN_NEGOTIATED_PROTOCOL/
s/RESPONSE_INFO_WAS_NPN/RESPONSE_INFO_WAS_ALPN/
s/was_npn_negotiated/was_alpn_negotiated/
s/npn_negotiated_protocol/alpn_negotiated_protocol/
s/ERR_NPN_NEGOTIATION_FAILED/ERR_ALPN_NEGOTIATION_FAILED/
WasNpnNegotiated and npnNegotiatedProtocol are not renamed in this CL,
because these names are exposed to the web platform,
and developers might depend on them.
BUG=526713
Review-Url: https://codereview.chromium.org/2347163002
Cr-Commit-Position: refs/heads/master@{#420065}
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d17ef21..7bf66239 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -450,8 +450,8 @@
stream_.reset(stream);
server_ssl_config_ = used_ssl_config;
proxy_info_ = used_proxy_info;
- response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
- response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString(
+ response_.was_alpn_negotiated = stream_request_->was_alpn_negotiated();
+ response_.alpn_negotiated_protocol = SSLClientSocket::NextProtoToString(
stream_request_->negotiated_protocol());
response_.was_fetched_via_spdy = stream_request_->using_spdy();
response_.was_fetched_via_proxy = !proxy_info_.is_direct();
