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

Side by Side Diff: net/quic/quic_stream_factory_test.cc

Issue 504953003: Remove implicit conversions from scoped_refptr to T* in net/quic/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/quic/quic_spdy_server_stream.cc ('k') | net/quic/reliable_quic_stream_test.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/quic/quic_stream_factory.h" 5 #include "net/quic/quic_stream_factory.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "net/base/test_data_directory.h" 9 #include "net/base/test_data_directory.h"
10 #include "net/cert/cert_verifier.h" 10 #include "net/cert/cert_verifier.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 HostPortPair server1("www.example.org", 443); 488 HostPortPair server1("www.example.org", 443);
489 HostPortPair server2("mail.example.org", 443); 489 HostPortPair server2("mail.example.org", 443);
490 490
491 // Load a cert that is valid for: 491 // Load a cert that is valid for:
492 // www.example.org (server1) 492 // www.example.org (server1)
493 // mail.example.org (server2) 493 // mail.example.org (server2)
494 // www.example.com 494 // www.example.com
495 base::FilePath certs_dir = GetTestCertsDirectory(); 495 base::FilePath certs_dir = GetTestCertsDirectory();
496 scoped_refptr<X509Certificate> test_cert( 496 scoped_refptr<X509Certificate> test_cert(
497 ImportCertFromFile(certs_dir, "spdy_pooling.pem")); 497 ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
498 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); 498 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
499 ProofVerifyDetailsChromium verify_details; 499 ProofVerifyDetailsChromium verify_details;
500 verify_details.cert_verify_result.verified_cert = test_cert; 500 verify_details.cert_verify_result.verified_cert = test_cert;
501 verify_details.cert_verify_result.is_issued_by_known_root = true; 501 verify_details.cert_verify_result.is_issued_by_known_root = true;
502 crypto_client_stream_factory_.set_proof_verify_details(&verify_details); 502 crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
503 503
504 host_resolver_.set_synchronous_mode(true); 504 host_resolver_.set_synchronous_mode(true);
505 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", ""); 505 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");
506 host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", ""); 506 host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
507 507
508 QuicStreamRequest request(&factory_); 508 QuicStreamRequest request(&factory_);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 HostPortPair server2("mail.google.com", 443); 553 HostPortPair server2("mail.google.com", 443);
554 554
555 // Load a cert that is valid for: 555 // Load a cert that is valid for:
556 // www.example.org (server1) 556 // www.example.org (server1)
557 // mail.example.org 557 // mail.example.org
558 // www.example.com 558 // www.example.com
559 // But is not valid for mail.google.com (server2). 559 // But is not valid for mail.google.com (server2).
560 base::FilePath certs_dir = GetTestCertsDirectory(); 560 base::FilePath certs_dir = GetTestCertsDirectory();
561 scoped_refptr<X509Certificate> test_cert( 561 scoped_refptr<X509Certificate> test_cert(
562 ImportCertFromFile(certs_dir, "spdy_pooling.pem")); 562 ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
563 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); 563 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
564 ProofVerifyDetailsChromium verify_details; 564 ProofVerifyDetailsChromium verify_details;
565 verify_details.cert_verify_result.verified_cert = test_cert; 565 verify_details.cert_verify_result.verified_cert = test_cert;
566 crypto_client_stream_factory_.set_proof_verify_details(&verify_details); 566 crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
567 567
568 568
569 host_resolver_.set_synchronous_mode(true); 569 host_resolver_.set_synchronous_mode(true);
570 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", ""); 570 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");
571 host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", ""); 571 host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
572 572
573 QuicStreamRequest request(&factory_); 573 QuicStreamRequest request(&factory_);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 uint8 backup_pin = 2; 619 uint8 backup_pin = 2;
620 test::AddPin(&transport_security_state_, "mail.example.org", primary_pin, 620 test::AddPin(&transport_security_state_, "mail.example.org", primary_pin,
621 backup_pin); 621 backup_pin);
622 622
623 // Load a cert that is valid for: 623 // Load a cert that is valid for:
624 // www.example.org (server1) 624 // www.example.org (server1)
625 // mail.example.org (server2) 625 // mail.example.org (server2)
626 base::FilePath certs_dir = GetTestCertsDirectory(); 626 base::FilePath certs_dir = GetTestCertsDirectory();
627 scoped_refptr<X509Certificate> test_cert( 627 scoped_refptr<X509Certificate> test_cert(
628 ImportCertFromFile(certs_dir, "spdy_pooling.pem")); 628 ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
629 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); 629 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
630 ProofVerifyDetailsChromium verify_details; 630 ProofVerifyDetailsChromium verify_details;
631 verify_details.cert_verify_result.verified_cert = test_cert; 631 verify_details.cert_verify_result.verified_cert = test_cert;
632 verify_details.cert_verify_result.is_issued_by_known_root = true; 632 verify_details.cert_verify_result.is_issued_by_known_root = true;
633 verify_details.cert_verify_result.public_key_hashes.push_back( 633 verify_details.cert_verify_result.public_key_hashes.push_back(
634 test::GetTestHashValue(primary_pin)); 634 test::GetTestHashValue(primary_pin));
635 crypto_client_stream_factory_.set_proof_verify_details(&verify_details); 635 crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
636 636
637 637
638 host_resolver_.set_synchronous_mode(true); 638 host_resolver_.set_synchronous_mode(true);
639 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", ""); 639 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 uint8 bad_pin = 3; 690 uint8 bad_pin = 3;
691 test::AddPin(&transport_security_state_, "mail.example.org", primary_pin, 691 test::AddPin(&transport_security_state_, "mail.example.org", primary_pin,
692 backup_pin); 692 backup_pin);
693 693
694 // Load a cert that is valid for: 694 // Load a cert that is valid for:
695 // www.example.org (server1) 695 // www.example.org (server1)
696 // mail.example.org (server2) 696 // mail.example.org (server2)
697 base::FilePath certs_dir = GetTestCertsDirectory(); 697 base::FilePath certs_dir = GetTestCertsDirectory();
698 scoped_refptr<X509Certificate> test_cert( 698 scoped_refptr<X509Certificate> test_cert(
699 ImportCertFromFile(certs_dir, "spdy_pooling.pem")); 699 ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
700 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert); 700 ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
701 ProofVerifyDetailsChromium verify_details; 701 ProofVerifyDetailsChromium verify_details;
702 verify_details.cert_verify_result.verified_cert = test_cert; 702 verify_details.cert_verify_result.verified_cert = test_cert;
703 verify_details.cert_verify_result.is_issued_by_known_root = true; 703 verify_details.cert_verify_result.is_issued_by_known_root = true;
704 verify_details.cert_verify_result.public_key_hashes.push_back( 704 verify_details.cert_verify_result.public_key_hashes.push_back(
705 test::GetTestHashValue(bad_pin)); 705 test::GetTestHashValue(bad_pin));
706 crypto_client_stream_factory_.set_proof_verify_details(&verify_details); 706 crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
707 707
708 708
709 host_resolver_.set_synchronous_mode(true); 709 host_resolver_.set_synchronous_mode(true);
710 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", ""); 710 host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 QuicCryptoClientConfig::CachedState* cached2 = 1291 QuicCryptoClientConfig::CachedState* cached2 =
1292 crypto_config->LookupOrCreate(server_id2); 1292 crypto_config->LookupOrCreate(server_id2);
1293 EXPECT_NE(cached1->source_address_token(), cached2->source_address_token()); 1293 EXPECT_NE(cached1->source_address_token(), cached2->source_address_token());
1294 EXPECT_TRUE(cached2->source_address_token().empty()); 1294 EXPECT_TRUE(cached2->source_address_token().empty());
1295 EXPECT_FALSE(cached2->proof_valid()); 1295 EXPECT_FALSE(cached2->proof_valid());
1296 } 1296 }
1297 } 1297 }
1298 1298
1299 } // namespace test 1299 } // namespace test
1300 } // namespace net 1300 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_spdy_server_stream.cc ('k') | net/quic/reliable_quic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698