Index: net/http/http_stream_factory_impl_request.cc |
diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc |
index bc0e4216d9de4e17c7fd0b21969fb28898d433f6..65786598f9c27ff74707571542aa53cf740b8e2b 100644 |
--- a/net/http/http_stream_factory_impl_request.cc |
+++ b/net/http/http_stream_factory_impl_request.cc |
@@ -30,7 +30,7 @@ HttpStreamFactoryImpl::Request::Request( |
delegate_(delegate), |
net_log_(net_log), |
completed_(false), |
- was_npn_negotiated_(false), |
+ was_alpn_negotiated_(false), |
negotiated_protocol_(kProtoUnknown), |
using_spdy_(false), |
stream_type_(stream_type) { |
@@ -49,12 +49,12 @@ void HttpStreamFactoryImpl::Request::SetSpdySessionKey( |
spdy_session_key_.reset(new SpdySessionKey(spdy_session_key)); |
} |
-void HttpStreamFactoryImpl::Request::Complete(bool was_npn_negotiated, |
+void HttpStreamFactoryImpl::Request::Complete(bool was_alpn_negotiated, |
NextProto negotiated_protocol, |
bool using_spdy) { |
DCHECK(!completed_); |
completed_ = true; |
- was_npn_negotiated_ = was_npn_negotiated; |
+ was_alpn_negotiated_ = was_alpn_negotiated; |
negotiated_protocol_ = negotiated_protocol; |
using_spdy_ = using_spdy; |
} |
@@ -135,9 +135,9 @@ LoadState HttpStreamFactoryImpl::Request::GetLoadState() const { |
return helper_->GetLoadState(); |
} |
-bool HttpStreamFactoryImpl::Request::was_npn_negotiated() const { |
+bool HttpStreamFactoryImpl::Request::was_alpn_negotiated() const { |
DCHECK(completed_); |
- return was_npn_negotiated_; |
+ return was_alpn_negotiated_; |
} |
NextProto HttpStreamFactoryImpl::Request::negotiated_protocol() const { |