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

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

Issue 454513002: This CL is a follow up to https://codereview.chromium.org/353713005. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed formatting change Created 6 years, 4 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
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | no next file » | 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/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 TEST_P(SSLClientSocketPoolTest, SocketsConnectWithoutFlag) { 324 TEST_P(SSLClientSocketPoolTest, SocketsConnectWithoutFlag) {
325 StaticSocketDataProvider data1; 325 StaticSocketDataProvider data1;
326 StaticSocketDataProvider data2; 326 StaticSocketDataProvider data2;
327 StaticSocketDataProvider data3; 327 StaticSocketDataProvider data3;
328 socket_factory_.AddSocketDataProvider(&data1); 328 socket_factory_.AddSocketDataProvider(&data1);
329 socket_factory_.AddSocketDataProvider(&data2); 329 socket_factory_.AddSocketDataProvider(&data2);
330 socket_factory_.AddSocketDataProvider(&data3); 330 socket_factory_.AddSocketDataProvider(&data3);
331 331
332 SSLSocketDataProvider ssl(ASYNC, OK); 332 SSLSocketDataProvider ssl(ASYNC, OK);
333 ssl.is_in_session_cache = false; 333 ssl.is_in_session_cache = false;
334 ssl.should_block_on_connect = true; 334 ssl.should_pause_on_connect = true;
335 SSLSocketDataProvider ssl2(ASYNC, OK); 335 SSLSocketDataProvider ssl2(ASYNC, OK);
336 ssl2.is_in_session_cache = false; 336 ssl2.is_in_session_cache = false;
337 ssl2.should_block_on_connect = true; 337 ssl2.should_pause_on_connect = true;
338 SSLSocketDataProvider ssl3(ASYNC, OK); 338 SSLSocketDataProvider ssl3(ASYNC, OK);
339 ssl3.is_in_session_cache = false; 339 ssl3.is_in_session_cache = false;
340 ssl3.should_block_on_connect = true; 340 ssl3.should_pause_on_connect = true;
341 socket_factory_.AddSSLSocketDataProvider(&ssl); 341 socket_factory_.AddSSLSocketDataProvider(&ssl);
342 socket_factory_.AddSSLSocketDataProvider(&ssl2); 342 socket_factory_.AddSSLSocketDataProvider(&ssl2);
343 socket_factory_.AddSSLSocketDataProvider(&ssl3); 343 socket_factory_.AddSSLSocketDataProvider(&ssl3);
344 344
345 CreatePool(true, false, false); 345 CreatePool(true, false, false);
346 346
347 scoped_refptr<SSLSocketParams> params1 = 347 scoped_refptr<SSLSocketParams> params1 =
348 SSLParams(ProxyServer::SCHEME_DIRECT, false); 348 SSLParams(ProxyServer::SCHEME_DIRECT, false);
349 scoped_refptr<SSLSocketParams> params2 = 349 scoped_refptr<SSLSocketParams> params2 =
350 SSLParams(ProxyServer::SCHEME_DIRECT, false); 350 SSLParams(ProxyServer::SCHEME_DIRECT, false);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 TEST_P(SSLClientSocketPoolTest, DeletedSSLConnectJob) { 397 TEST_P(SSLClientSocketPoolTest, DeletedSSLConnectJob) {
398 StaticSocketDataProvider data1; 398 StaticSocketDataProvider data1;
399 StaticSocketDataProvider data2; 399 StaticSocketDataProvider data2;
400 StaticSocketDataProvider data3; 400 StaticSocketDataProvider data3;
401 socket_factory_.AddSocketDataProvider(&data1); 401 socket_factory_.AddSocketDataProvider(&data1);
402 socket_factory_.AddSocketDataProvider(&data2); 402 socket_factory_.AddSocketDataProvider(&data2);
403 socket_factory_.AddSocketDataProvider(&data3); 403 socket_factory_.AddSocketDataProvider(&data3);
404 404
405 SSLSocketDataProvider ssl(ASYNC, OK); 405 SSLSocketDataProvider ssl(ASYNC, OK);
406 ssl.is_in_session_cache = false; 406 ssl.is_in_session_cache = false;
407 ssl.should_block_on_connect = true; 407 ssl.should_pause_on_connect = true;
408 SSLSocketDataProvider ssl2(ASYNC, OK); 408 SSLSocketDataProvider ssl2(ASYNC, OK);
409 ssl2.is_in_session_cache = false; 409 ssl2.is_in_session_cache = false;
410 SSLSocketDataProvider ssl3(ASYNC, OK); 410 SSLSocketDataProvider ssl3(ASYNC, OK);
411 ssl3.is_in_session_cache = false; 411 ssl3.is_in_session_cache = false;
412 socket_factory_.AddSSLSocketDataProvider(&ssl); 412 socket_factory_.AddSSLSocketDataProvider(&ssl);
413 socket_factory_.AddSSLSocketDataProvider(&ssl2); 413 socket_factory_.AddSSLSocketDataProvider(&ssl2);
414 socket_factory_.AddSSLSocketDataProvider(&ssl3); 414 socket_factory_.AddSSLSocketDataProvider(&ssl3);
415 415
416 enable_ssl_connect_job_waiting_ = true; 416 enable_ssl_connect_job_waiting_ = true;
417 CreatePool(true, false, false); 417 CreatePool(true, false, false);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 StaticSocketDataProvider data2; 462 StaticSocketDataProvider data2;
463 StaticSocketDataProvider data3; 463 StaticSocketDataProvider data3;
464 StaticSocketDataProvider data4; 464 StaticSocketDataProvider data4;
465 socket_factory_.AddSocketDataProvider(&data1); 465 socket_factory_.AddSocketDataProvider(&data1);
466 socket_factory_.AddSocketDataProvider(&data2); 466 socket_factory_.AddSocketDataProvider(&data2);
467 socket_factory_.AddSocketDataProvider(&data3); 467 socket_factory_.AddSocketDataProvider(&data3);
468 socket_factory_.AddSocketDataProvider(&data4); 468 socket_factory_.AddSocketDataProvider(&data4);
469 469
470 SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR); 470 SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
471 ssl.is_in_session_cache = false; 471 ssl.is_in_session_cache = false;
472 ssl.should_block_on_connect = true; 472 ssl.should_pause_on_connect = true;
473 SSLSocketDataProvider ssl2(ASYNC, OK); 473 SSLSocketDataProvider ssl2(ASYNC, OK);
474 ssl2.is_in_session_cache = false; 474 ssl2.is_in_session_cache = false;
475 SSLSocketDataProvider ssl3(ASYNC, OK); 475 SSLSocketDataProvider ssl3(ASYNC, OK);
476 ssl3.is_in_session_cache = false; 476 ssl3.is_in_session_cache = false;
477 SSLSocketDataProvider ssl4(ASYNC, OK); 477 SSLSocketDataProvider ssl4(ASYNC, OK);
478 ssl4.is_in_session_cache = false; 478 ssl4.is_in_session_cache = false;
479 socket_factory_.AddSSLSocketDataProvider(&ssl); 479 socket_factory_.AddSSLSocketDataProvider(&ssl);
480 socket_factory_.AddSSLSocketDataProvider(&ssl2); 480 socket_factory_.AddSSLSocketDataProvider(&ssl2);
481 socket_factory_.AddSSLSocketDataProvider(&ssl3); 481 socket_factory_.AddSSLSocketDataProvider(&ssl3);
482 socket_factory_.AddSSLSocketDataProvider(&ssl4); 482 socket_factory_.AddSSLSocketDataProvider(&ssl4);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 StaticSocketDataProvider data3; 535 StaticSocketDataProvider data3;
536 StaticSocketDataProvider data4; 536 StaticSocketDataProvider data4;
537 StaticSocketDataProvider data5; 537 StaticSocketDataProvider data5;
538 socket_factory_.AddSocketDataProvider(&data1); 538 socket_factory_.AddSocketDataProvider(&data1);
539 socket_factory_.AddSocketDataProvider(&data2); 539 socket_factory_.AddSocketDataProvider(&data2);
540 socket_factory_.AddSocketDataProvider(&data3); 540 socket_factory_.AddSocketDataProvider(&data3);
541 socket_factory_.AddSocketDataProvider(&data4); 541 socket_factory_.AddSocketDataProvider(&data4);
542 socket_factory_.AddSocketDataProvider(&data5); 542 socket_factory_.AddSocketDataProvider(&data5);
543 SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR); 543 SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
544 ssl.is_in_session_cache = false; 544 ssl.is_in_session_cache = false;
545 ssl.should_block_on_connect = true; 545 ssl.should_pause_on_connect = true;
546 SSLSocketDataProvider ssl2(ASYNC, OK); 546 SSLSocketDataProvider ssl2(ASYNC, OK);
547 ssl2.is_in_session_cache = false; 547 ssl2.is_in_session_cache = false;
548 ssl2.should_block_on_connect = true; 548 ssl2.should_pause_on_connect = true;
549 SSLSocketDataProvider ssl3(ASYNC, OK); 549 SSLSocketDataProvider ssl3(ASYNC, OK);
550 ssl3.is_in_session_cache = false; 550 ssl3.is_in_session_cache = false;
551 SSLSocketDataProvider ssl4(ASYNC, OK); 551 SSLSocketDataProvider ssl4(ASYNC, OK);
552 ssl4.is_in_session_cache = false; 552 ssl4.is_in_session_cache = false;
553 SSLSocketDataProvider ssl5(ASYNC, OK); 553 SSLSocketDataProvider ssl5(ASYNC, OK);
554 ssl5.is_in_session_cache = false; 554 ssl5.is_in_session_cache = false;
555 555
556 socket_factory_.AddSSLSocketDataProvider(&ssl); 556 socket_factory_.AddSSLSocketDataProvider(&ssl);
557 socket_factory_.AddSSLSocketDataProvider(&ssl2); 557 socket_factory_.AddSSLSocketDataProvider(&ssl2);
558 socket_factory_.AddSSLSocketDataProvider(&ssl3); 558 socket_factory_.AddSSLSocketDataProvider(&ssl3);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsSuccess) { 625 TEST_P(SSLClientSocketPoolTest, SimultaneousConnectJobsSuccess) {
626 StaticSocketDataProvider data1; 626 StaticSocketDataProvider data1;
627 StaticSocketDataProvider data2; 627 StaticSocketDataProvider data2;
628 StaticSocketDataProvider data3; 628 StaticSocketDataProvider data3;
629 socket_factory_.AddSocketDataProvider(&data1); 629 socket_factory_.AddSocketDataProvider(&data1);
630 socket_factory_.AddSocketDataProvider(&data2); 630 socket_factory_.AddSocketDataProvider(&data2);
631 socket_factory_.AddSocketDataProvider(&data3); 631 socket_factory_.AddSocketDataProvider(&data3);
632 632
633 SSLSocketDataProvider ssl(ASYNC, OK); 633 SSLSocketDataProvider ssl(ASYNC, OK);
634 ssl.is_in_session_cache = false; 634 ssl.is_in_session_cache = false;
635 ssl.should_block_on_connect = true; 635 ssl.should_pause_on_connect = true;
636 SSLSocketDataProvider ssl2(ASYNC, OK); 636 SSLSocketDataProvider ssl2(ASYNC, OK);
637 ssl2.is_in_session_cache = false; 637 ssl2.is_in_session_cache = false;
638 SSLSocketDataProvider ssl3(ASYNC, OK); 638 SSLSocketDataProvider ssl3(ASYNC, OK);
639 ssl3.is_in_session_cache = false; 639 ssl3.is_in_session_cache = false;
640 socket_factory_.AddSSLSocketDataProvider(&ssl); 640 socket_factory_.AddSSLSocketDataProvider(&ssl);
641 socket_factory_.AddSSLSocketDataProvider(&ssl2); 641 socket_factory_.AddSSLSocketDataProvider(&ssl2);
642 socket_factory_.AddSSLSocketDataProvider(&ssl3); 642 socket_factory_.AddSSLSocketDataProvider(&ssl3);
643 643
644 enable_ssl_connect_job_waiting_ = true; 644 enable_ssl_connect_job_waiting_ = true;
645 CreatePool(true, false, false); 645 CreatePool(true, false, false);
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 ssl.channel_id_sent = true; 1389 ssl.channel_id_sent = true;
1390 ssl.SetNextProto(GetParam()); 1390 ssl.SetNextProto(GetParam());
1391 TestIPPoolingDisabled(&ssl); 1391 TestIPPoolingDisabled(&ssl);
1392 } 1392 }
1393 1393
1394 // It would be nice to also test the timeouts in SSLClientSocketPool. 1394 // It would be nice to also test the timeouts in SSLClientSocketPool.
1395 1395
1396 } // namespace 1396 } // namespace
1397 1397
1398 } // namespace net 1398 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698