net/http/http_network_transaction_unittest.cc - Issue 1097773003: Clean up NPN/ALPN-related SSLClientSocket bits.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 1097773003: Clean up NPN/ALPN-related SSLClientSocket bits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: const Created 5 years, 8 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 | « chrome/browser/extensions/api/socket/tls_socket_unittest.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | net/socket/ssl_client_socket_pool.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_network_transaction_unittest.cc

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc

index eb811613557b1c30c9a45a1e1ba783022510fa5b..81eb8f1b1b4a9b8c08883a9735de3b43110bce33 100644

--- a/net/http/http_network_transaction_unittest.cc

+++ b/net/http/http_network_transaction_unittest.cc

@@ -3605,8 +3605,6 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) {

ssl.SetNextProto(GetParam());

session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);

SSLSocketDataProvider ssl2(ASYNC, OK);

- ssl2.was_npn_negotiated = false;

- ssl2.protocol_negotiated = kProtoUnknown;

session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);

TestCompletionCallback callback1;

@@ -3695,7 +3693,6 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) {

session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);

SSLSocketDataProvider ssl2(ASYNC, OK);

ssl2.SetNextProto(GetParam());

- ssl2.protocol_negotiated = GetParam();

session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);

TestCompletionCallback callback1;

@@ -3872,12 +3869,8 @@ TEST_P(HttpNetworkTransactionTest,

ssl.SetNextProto(GetParam());

session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl);

SSLSocketDataProvider ssl2(ASYNC, OK);

- ssl2.was_npn_negotiated = false;

- ssl2.protocol_negotiated = kProtoUnknown;

session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl2);

SSLSocketDataProvider ssl3(ASYNC, OK);

- ssl3.was_npn_negotiated = false;

- ssl3.protocol_negotiated = kProtoUnknown;

session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl3);

TestCompletionCallback callback;

@@ -4008,8 +4001,6 @@ TEST_P(HttpNetworkTransactionTest,

ssl.SetNextProto(GetParam());

session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl);

SSLSocketDataProvider ssl2(ASYNC, OK);

- ssl2.was_npn_negotiated = false;

- ssl2.protocol_negotiated = kProtoUnknown;

session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl2);

TestCompletionCallback callback;

@@ -10349,9 +10340,7 @@ TEST_P(HttpNetworkTransactionTest, NpnWithHttpOverSSL) {

};

SSLSocketDataProvider ssl(ASYNC, OK);

- ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;

- ssl.next_proto = "http/1.1";

- ssl.protocol_negotiated = kProtoHTTP11;

+ ssl.SetNextProto(kProtoHTTP11);

session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);