Index: net/spdy/spdy_http_stream.cc |
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc |
index 01656e93cc912679f174bbe98428388fca410ec5..fd72bf07af706f64388fdeffe30bb4c3222c83da 100644 |
--- a/net/spdy/spdy_http_stream.cc |
+++ b/net/spdy/spdy_http_stream.cc |
@@ -49,7 +49,7 @@ SpdyHttpStream::SpdyHttpStream(const base::WeakPtr<SpdySession>& spdy_session, |
buffered_read_callback_pending_(false), |
more_read_data_pending_(false), |
direct_(direct), |
- was_npn_negotiated_(false), |
+ was_alpn_negotiated_(false), |
negotiated_protocol_(kProtoUnknown), |
weak_factory_(this) { |
DCHECK(spdy_session_.get()); |
@@ -330,8 +330,8 @@ SpdyResponseHeadersStatus SpdyHttpStream::OnResponseHeadersUpdated( |
response_headers_status_ = RESPONSE_HEADERS_ARE_COMPLETE; |
// Don't store the SSLInfo in the response here, HttpNetworkTransaction |
// will take care of that part. |
- response_info_->was_npn_negotiated = was_npn_negotiated_; |
- response_info_->npn_negotiated_protocol = |
+ response_info_->was_alpn_negotiated = was_alpn_negotiated_; |
+ response_info_->alpn_negotiated_protocol = |
SSLClientSocket::NextProtoToString(negotiated_protocol_); |
response_info_->request_time = stream_->GetRequestTime(); |
response_info_->connection_info = |
@@ -450,7 +450,7 @@ void SpdyHttpStream::ReadAndSendRequestBodyData() { |
void SpdyHttpStream::InitializeStreamHelper() { |
stream_->SetDelegate(this); |
stream_->GetSSLInfo(&ssl_info_); |
- was_npn_negotiated_ = stream_->WasNpnNegotiated(); |
+ was_alpn_negotiated_ = stream_->WasNpnNegotiated(); |
negotiated_protocol_ = stream_->GetNegotiatedProtocol(); |
} |