Index: content/child/weburlresponse_extradata_impl.h |
diff --git a/content/child/weburlresponse_extradata_impl.h b/content/child/weburlresponse_extradata_impl.h |
index 1529138d0a7c20d2e8e86a0fb78a68f1cda97b66..9ff55f9035ad4a8fb7d3691f81a036be6211aae6 100644 |
--- a/content/child/weburlresponse_extradata_impl.h |
+++ b/content/child/weburlresponse_extradata_impl.h |
@@ -20,11 +20,11 @@ class CONTENT_EXPORT WebURLResponseExtraDataImpl : |
public NON_EXPORTED_BASE(blink::WebURLResponse::ExtraData) { |
public: |
explicit WebURLResponseExtraDataImpl( |
- const std::string& npn_negotiated_protocol); |
+ const std::string& alpn_negotiated_protocol); |
~WebURLResponseExtraDataImpl() override; |
- const std::string& npn_negotiated_protocol() const { |
- return npn_negotiated_protocol_; |
+ const std::string& alpn_negotiated_protocol() const { |
+ return alpn_negotiated_protocol_; |
} |
// Flag whether this request was loaded via an explicit proxy |
@@ -66,11 +66,9 @@ class CONTENT_EXPORT WebURLResponseExtraDataImpl : |
// Flag whether this request was loaded after the |
// TLS/Next-Protocol-Negotiation was used. |
// This is related to SPDY. |
- bool was_npn_negotiated() const { |
- return was_npn_negotiated_; |
- } |
- void set_was_npn_negotiated(bool was_npn_negotiated) { |
- was_npn_negotiated_ = was_npn_negotiated; |
+ bool was_alpn_negotiated() const { return was_alpn_negotiated_; } |
+ void set_was_alpn_negotiated(bool was_alpn_negotiated) { |
+ was_alpn_negotiated_ = was_alpn_negotiated; |
} |
// Flag whether this request was made when "Alternate-Protocol: xxx" |
@@ -100,12 +98,12 @@ class CONTENT_EXPORT WebURLResponseExtraDataImpl : |
} |
private: |
- std::string npn_negotiated_protocol_; |
+ std::string alpn_negotiated_protocol_; |
bool is_ftp_directory_listing_; |
bool was_fetched_via_proxy_; |
net::HostPortPair proxy_server_; |
bool was_fetched_via_spdy_; |
- bool was_npn_negotiated_; |
+ bool was_alpn_negotiated_; |
net::HttpResponseInfo::ConnectionInfo connection_info_; |
bool was_alternate_protocol_available_; |
bool is_using_lofi_; |