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

net/spdy/spdy_test_util_common.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_test_util_common.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 958 matching lines @@
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyConnect(
     const char* const extra_headers[],
     int extra_header_count,
     int stream_id,
     RequestPriority priority,
     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);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyPush(const char* const extra_headers[],
                                            int extra_header_count,
                                            int stream_id,
                                            int associated_stream_id,
                                            const char* url) {
@@ skipping 335 matching lines @@
   }
 }
 
 void SpdyTestUtil::SetPriority(RequestPriority priority,
                                SpdySynStreamIR* ir) const {
   ir->set_priority(ConvertRequestPriorityToSpdyPriority(
       priority, spdy_version()));
 }
 
 }  // namespace net