Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9495)

Unified Diff: content/child/web_url_loader_impl.cc

Issue 2347163002: s/NPN/ALPN/ (Closed)
Patch Set: Re: #12. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | content/child/weburlresponse_extradata_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | content/child/weburlresponse_extradata_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698