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

Side by Side Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 25977005: [SPDY] Do not advertise SPDY/2 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/spdy/buffered_spdy_framer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 HttpProxyClientSocketPool http_proxy_socket_pool_; 218 HttpProxyClientSocketPool http_proxy_socket_pool_;
219 219
220 SSLConfig ssl_config_; 220 SSLConfig ssl_config_;
221 scoped_ptr<ClientSocketPoolHistograms> ssl_histograms_; 221 scoped_ptr<ClientSocketPoolHistograms> ssl_histograms_;
222 scoped_ptr<SSLClientSocketPool> pool_; 222 scoped_ptr<SSLClientSocketPool> pool_;
223 }; 223 };
224 224
225 INSTANTIATE_TEST_CASE_P( 225 INSTANTIATE_TEST_CASE_P(
226 NextProto, 226 NextProto,
227 SSLClientSocketPoolTest, 227 SSLClientSocketPoolTest,
228 testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2, 228 testing::Values(kProtoDeprecatedSPDY2,
229 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2,
229 kProtoHTTP2Draft04)); 230 kProtoHTTP2Draft04));
230 231
231 TEST_P(SSLClientSocketPoolTest, TCPFail) { 232 TEST_P(SSLClientSocketPoolTest, TCPFail) {
232 StaticSocketDataProvider data; 233 StaticSocketDataProvider data;
233 data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED)); 234 data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_CONNECTION_FAILED));
234 socket_factory_.AddSocketDataProvider(&data); 235 socket_factory_.AddSocketDataProvider(&data);
235 236
236 CreatePool(true /* tcp pool */, false, false); 237 CreatePool(true /* tcp pool */, false, false);
237 scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT, 238 scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
238 false); 239 false);
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 ssl.channel_id_sent = true; 929 ssl.channel_id_sent = true;
929 ssl.SetNextProto(GetParam()); 930 ssl.SetNextProto(GetParam());
930 TestIPPoolingDisabled(&ssl); 931 TestIPPoolingDisabled(&ssl);
931 } 932 }
932 933
933 // It would be nice to also test the timeouts in SSLClientSocketPool. 934 // It would be nice to also test the timeouts in SSLClientSocketPool.
934 935
935 } // namespace 936 } // namespace
936 937
937 } // namespace net 938 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/spdy/buffered_spdy_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698