Custom hosts in QuicTestPacketMaker.

net/quic/quic_network_transaction_unittest.cc

Index: net/quic/quic_network_transaction_unittest.cc
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index ed7d8819295865a06052aaa2cb84837cb1bcfa5e..69f09be933cd76e5e99a2a74881d9ce52d981020 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -63,6 +63,8 @@ static const char kQuicAlternateProtocolDifferentPortHttpHeader[] =
 static const char kQuicAlternateProtocolHttpsHeader[] =
     "Alternate-Protocol: 443:quic\r\n\r\n";
 
+const char kDefaultServerHostName[] = "www.google.com";
+
 }  // namespace
 
 // Helper class to encapsulate MockReads and MockWrites for QUIC.
@@ -134,7 +136,7 @@ class QuicNetworkTransactionTest
  protected:
   QuicNetworkTransactionTest()
       : clock_(new MockClock),
-        maker_(GetParam(), 0, clock_),
+        maker_(GetParam(), 0, clock_, kDefaultServerHostName),
         ssl_config_service_(new SSLConfigServiceDefaults),
         proxy_service_(ProxyService::CreateDirect()),
         auth_handler_factory_(
@@ -142,7 +144,9 @@ class QuicNetworkTransactionTest
         random_generator_(0),
         hanging_data_(nullptr, 0, nullptr, 0) {
     request_.method = "GET";
-    request_.url = GURL("http://www.google.com/");
+    std::string url("http://");
+    url.append(kDefaultServerHostName);
+    request_.url = GURL(url);
     request_.load_flags = 0;
     clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20));
   }
@@ -1205,6 +1209,7 @@ TEST_P(QuicNetworkTransactionTest, ConnectionCloseDuringConnect) {
 // the appropriate error code.  Note that this never happens in production,
 // because the handshake (which this test mocks) would fail in this scenario.
 TEST_P(QuicNetworkTransactionTest, SecureResourceOverInsecureQuic) {
+  maker_.set_hostname("www.example.org");

[Ryan Hamilton, 2015/05/14 18:57:16]

nice! This change makes it nice and clear what this TEST is doing.

(Though since this test is actually an "over insecure QUIC" test, I think the
old hostname would have worked.  But then the next test would be less symmetric
so keeping it this way is cool)

[Bence, 2015/05/14 19:00:54]

That's exactly what I was thinking.  Though the two tests are not quite symmetic
enough to make a test subclass, but you'll see a couple of those in my next two
CLs.

   MockQuicData mock_quic_data;
   mock_quic_data.AddWrite(
       ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
@@ -1217,7 +1222,7 @@ TEST_P(QuicNetworkTransactionTest, SecureResourceOverInsecureQuic) {
   mock_quic_data.AddRead(SYNCHRONOUS, 0);
   mock_quic_data.AddSocketDataToFactory(&socket_factory_);
 
-  request_.url = GURL("https://www.google.com:443");
+  request_.url = GURL("https://www.example.org:443");
   AddHangingNonAlternateProtocolSocketData();
   CreateSessionWithNextProtos();
   AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE);
@@ -1230,6 +1235,7 @@ TEST_P(QuicNetworkTransactionTest, SecureResourceOverInsecureQuic) {
 }
 
 TEST_P(QuicNetworkTransactionTest, SecureResourceOverSecureQuic) {
+  maker_.set_hostname("www.example.org");
   MockQuicData mock_quic_data;
   mock_quic_data.AddWrite(
       ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
@@ -1245,11 +1251,14 @@ TEST_P(QuicNetworkTransactionTest, SecureResourceOverSecureQuic) {
   scoped_refptr<X509Certificate> cert(
       ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"));
   ASSERT_TRUE(cert.get());
+  bool common_name_fallback_used;
+  EXPECT_TRUE(
+      cert->VerifyNameMatch("www.example.org", &common_name_fallback_used));

[Ryan Hamilton, 2015/05/14 18:57:16]

Good call! You could also add a maker_.host() and use it here, but perhaps
that's too much effort?

[Bence, 2015/05/14 19:00:54]

Fine balance between aesthetic completeness and not having too much logic in
tests.  I'll pass on this one, sorry.

   ProofVerifyDetailsChromium verify_details;
   verify_details.cert_verify_result.verified_cert = cert;
   crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
 
-  request_.url = GURL("https://www.google.com:443");
+  request_.url = GURL("https://www.example.org:443");
   AddHangingNonAlternateProtocolSocketData();
   CreateSessionWithNextProtos();
   AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE);