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

Unified Diff: net/http/http_proxy_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_response_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket_pool_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 19df6a08eeae96c0b41edbd07ea508b86dcc52dd..694d394319d49a9da14f19a90c498bfafe6b8fc7 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -351,9 +351,12 @@ INSTANTIATE_TEST_CASE_P(
HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY31),
HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY31),
HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY31),
- HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4),
- HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4),
- HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4)));
+ HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_14),
+ HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_14),
+ HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_14),
+ HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_15),
+ HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_15),
+ HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_15)));
TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) {
Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0);
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_response_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698