| Index: content/child/web_url_loader_impl.cc
|
| diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
|
| index c405acb003d48294c58353dd532a02a772818b73..7c87f2fced1d82a93ac407224a5b81a7f826445e 100644
|
| --- a/content/child/web_url_loader_impl.cc
|
| +++ b/content/child/web_url_loader_impl.cc
|
| @@ -1011,10 +1011,10 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
|
| SetSecurityStyleAndDetails(url, info, response, report_security_info);
|
|
|
| WebURLResponseExtraDataImpl* extra_data =
|
| - new WebURLResponseExtraDataImpl(info.npn_negotiated_protocol);
|
| + new WebURLResponseExtraDataImpl(info.alpn_negotiated_protocol);
|
| response->setExtraData(extra_data);
|
| extra_data->set_was_fetched_via_spdy(info.was_fetched_via_spdy);
|
| - extra_data->set_was_npn_negotiated(info.was_npn_negotiated);
|
| + extra_data->set_was_alpn_negotiated(info.was_alpn_negotiated);
|
| extra_data->set_was_alternate_protocol_available(
|
| info.was_alternate_protocol_available);
|
| extra_data->set_connection_info(info.connection_info);
|
| @@ -1062,8 +1062,8 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
|
| load_info.addResponseHeader(WebString::fromLatin1(it->first),
|
| WebString::fromLatin1(it->second));
|
| }
|
| - load_info.setNPNNegotiatedProtocol(WebString::fromLatin1(
|
| - info.npn_negotiated_protocol));
|
| + load_info.setNPNNegotiatedProtocol(
|
| + WebString::fromLatin1(info.alpn_negotiated_protocol));
|
| response->setHTTPLoadInfo(load_info);
|
| }
|
|
|
|
|