Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/tools/quic/test_tools/quic_test_client.cc

Index: net/tools/quic/test_tools/quic_test_client.cc
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
index 5271ad18c2a5de98de50ea8ad9e2e2d1dc373001..d05b5fb2c918af14a10cafe0401ecf8cd06af489 100644
--- a/net/tools/quic/test_tools/quic_test_client.cc
+++ b/net/tools/quic/test_tools/quic_test_client.cc
@@ -304,9 +304,14 @@ ssize_t QuicTestClient::SendMessage(const HTTPMessage& message) {
   // If we're not connected, try to find an sni hostname.
   if (!connected()) {
     GURL url(message.headers()->request_uri().as_string());
-    if (!url.host().empty()) {
-      client_->set_server_id(QuicServerId(url.host(), url.EffectiveIntPort(),
+    if (override_sni_set_) {
+      client_->set_server_id(QuicServerId(override_sni_, url.EffectiveIntPort(),
                                           PRIVACY_MODE_DISABLED));
+    } else {
+      if (!url.host().empty()) {
+        client_->set_server_id(QuicServerId(url.host(), url.EffectiveIntPort(),
+                                            PRIVACY_MODE_DISABLED));
+      }
     }
   }