net/socket/ssl_client_socket_pool_unittest.cc - Issue 723343002: Update from https://crrev.com/304121

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/socket/ssl_client_socket_pool_unittest.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/socket/ssl_client_socket_pool_unittest.cc

diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc

index 202cd8809e5e1541e184a8195b17ce942fb67cc5..8ac29ef3672b2b1a6dd9288d3351ce9de0779791 100644

--- a/net/socket/ssl_client_socket_pool_unittest.cc

+++ b/net/socket/ssl_client_socket_pool_unittest.cc

@@ -240,7 +240,7 @@ INSTANTIATE_TEST_CASE_P(

NextProto,

SSLClientSocketPoolTest,

testing::Values(kProtoDeprecatedSPDY2,

- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));

+ kProtoSPDY3, kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15));

// Tests that the final socket will connect even if all sockets

// prior to it fail.

« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/tcp_socket_win.cc » ('j') | no next file with comments »