relnote: remove insecure QUIC support

net/quic/quic_chromium_client_session_test.cc

Index: net/quic/quic_chromium_client_session_test.cc
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index f22ccde4875c44c7ef4c4ffd417291aec36b400d..00e02e451f3a76d5aa32568b38813d60a207165b 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -39,8 +39,8 @@ namespace net {
 namespace test {
 namespace {
 
-const char kServerHostname[] = "www.example.org";
-const uint16 kServerPort = 80;
+const char kServerHostname[] = "test.example.com";
+const uint16 kServerPort = 443;
 
 class QuicChromiumClientSessionTest
     : public ::testing::TestWithParam<QuicVersion> {
@@ -48,28 +48,27 @@ class QuicChromiumClientSessionTest
   QuicChromiumClientSessionTest()
       : connection_(new PacketSavingConnection(Perspective::IS_CLIENT,
                                                SupportedVersions(GetParam()))),
-        session_(connection_,
-                 GetSocket().Pass(),
-                 /*stream_factory=*/nullptr,
-                 /*crypto_client_stream_factory=*/nullptr,
-                 &clock_,
-                 &transport_security_state_,
-                 make_scoped_ptr((QuicServerInfo*)nullptr),
-                 QuicServerId(kServerHostname,
-                              kServerPort,
-                              /*is_secure=*/false,
-                              PRIVACY_MODE_DISABLED),
-                 kQuicYieldAfterPacketsRead,
-                 QuicTime::Delta::FromMilliseconds(
-                     kQuicYieldAfterDurationMilliseconds),
-                 /*cert_verify_flags=*/0,
-                 DefaultQuicConfig(),
-                 &crypto_config_,
-                 "CONNECTION_UNKNOWN",
-                 base::TimeTicks::Now(),
-                 base::ThreadTaskRunnerHandle::Get().get(),
-                 /*socket_performance_watcher=*/nullptr,
-                 &net_log_) {
+        crypto_config_(CryptoTestUtils::ProofVerifierForTesting()),
+        session_(
+            connection_,
+            GetSocket().Pass(),
+            /*stream_factory=*/nullptr,
+            /*crypto_client_stream_factory=*/nullptr,
+            &clock_,
+            &transport_security_state_,
+            make_scoped_ptr((QuicServerInfo*)nullptr),
+            QuicServerId(kServerHostname, kServerPort, PRIVACY_MODE_DISABLED),
+            kQuicYieldAfterPacketsRead,
+            QuicTime::Delta::FromMilliseconds(
+                kQuicYieldAfterDurationMilliseconds),
+            /*cert_verify_flags=*/0,
+            DefaultQuicConfig(),
+            &crypto_config_,
+            "CONNECTION_UNKNOWN",
+            base::TimeTicks::Now(),
+            base::ThreadTaskRunnerHandle::Get().get(),
+            /*socket_performance_watcher=*/nullptr,
+            &net_log_) {
     session_.Initialize();
     // Advance the time, because timers do not like uninitialized times.
     connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
@@ -99,12 +98,12 @@ class QuicChromiumClientSessionTest
   MockClientSocketFactory socket_factory_;
   StaticSocketDataProvider socket_data_;
   TransportSecurityState transport_security_state_;
+  QuicCryptoClientConfig crypto_config_;
   QuicChromiumClientSession session_;
   MockClock clock_;
   MockRandom random_;
   QuicConnectionVisitorInterface* visitor_;
   TestCompletionCallback callback_;
-  QuicCryptoClientConfig crypto_config_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests,
@@ -167,9 +166,9 @@ TEST_P(QuicChromiumClientSessionTest, GoAwayReceived) {
 
 TEST_P(QuicChromiumClientSessionTest, CanPool) {
   // Load a cert that is valid for:
-  //   www.example.org
+  //   test.example.com
   //   mail.example.org
-  //   www.example.com
+  //   test.example.org
 
   ProofVerifyDetailsChromium details;
   details.cert_verify_result.verified_cert =
@@ -179,16 +178,17 @@ TEST_P(QuicChromiumClientSessionTest, CanPool) {
   session_.OnProofVerifyDetailsAvailable(details);
   CompleteCryptoHandshake();
 
-  EXPECT_TRUE(session_.CanPool("www.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_FALSE(session_.CanPool("www.example.org", PRIVACY_MODE_ENABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_TRUE(session_.CanPool("test.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("test.example.com", PRIVACY_MODE_ENABLED));
+  // All URL's are secure QUIC.
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.google.com", PRIVACY_MODE_DISABLED));
 }
 
 TEST_P(QuicChromiumClientSessionTest, ConnectionPooledWithTlsChannelId) {
   // Load a cert that is valid for:
-  //   www.example.org
+  //   test.example.com
   //   mail.example.org
   //   www.example.com
 
@@ -201,9 +201,9 @@ TEST_P(QuicChromiumClientSessionTest, ConnectionPooledWithTlsChannelId) {
   CompleteCryptoHandshake();
   QuicChromiumClientSessionPeer::SetChannelIDSent(&session_, true);
 
-  EXPECT_TRUE(session_.CanPool("www.example.org", PRIVACY_MODE_DISABLED));
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_TRUE(session_.CanPool("test.example.com", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.example.com", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
   EXPECT_FALSE(session_.CanPool("mail.google.com", PRIVACY_MODE_DISABLED));
 }
 
@@ -249,7 +249,7 @@ TEST_P(QuicChromiumClientSessionTest, ConnectionPooledWithMatchingPin) {
   CompleteCryptoHandshake();
   QuicChromiumClientSessionPeer::SetChannelIDSent(&session_, true);
 
-  EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
+  EXPECT_FALSE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
 }
 
 }  // namespace