Disable HTTP/2 over NPN (with OpenSSL).
* Split SSLConfig.next_proto into two members: one for ALPN, one for NPN.
* Remove HTTP/2 from NPN.
* In OpenSSL, use alpn_protos for |ALPN|, and npn_protos for |NPN|.
* In NSS, use |alpn_protos| for both.
* In NSS, disable NPN if |npn_protos| is empty.
BUG=527066
Review URL: https://codereview.chromium.org/1387363004
Cr-Commit-Position: refs/heads/master@{#355427}
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index c9014a4..56f3bb3d1 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -1466,7 +1466,8 @@
// Preconnect a socket.
SSLConfig ssl_config;
session->ssl_config_service()->GetSSLConfig(&ssl_config);
- session->GetNextProtos(&ssl_config.next_protos);
+ session->GetAlpnProtos(&ssl_config.alpn_protos);
+ session->GetNpnProtos(&ssl_config.npn_protos);
session->http_stream_factory()->PreconnectStreams(1, request, ssl_config,
ssl_config);
// Wait for the preconnect to complete.
