Send appropriate pseudo-headers in HTTP/2 CONNECT request.

net/spdy/spdy_test_util_common.cc

Index: net/spdy/spdy_test_util_common.cc
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index e0437ff6564c35a5719cb09606b9482e1725a19f..935e4524fad5650448e9dd8cdcc05871ef88a2aa 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -976,10 +976,15 @@ SpdyFrame* SpdyTestUtil::ConstructSpdyConnect(
     const HostPortPair& host_port_pair) const {
   SpdyHeaderBlock block;
   block[GetMethodKey()] = "CONNECT";
-  block[GetPathKey()] = host_port_pair.ToString();
-  block[GetHostKey()] = (host_port_pair.port() == 443)
-                            ? host_port_pair.host()
-                            : host_port_pair.ToString();
+  if (spdy_version() < HTTP2) {
+    block[GetPathKey()] = host_port_pair.ToString();
+    block[GetHostKey()] = (host_port_pair.port() == 443)
+                              ? host_port_pair.host()
+                              : host_port_pair.ToString();
+  } else {
+    block[GetHostKey()] = host_port_pair.ToString();
+  }
+
   MaybeAddVersionHeader(&block);
   AppendToHeaderBlock(extra_headers, extra_header_count, &block);
   return ConstructSpdySyn(stream_id, block, priority, false, false);