Switch CreateSpdyHeadersFromHttpRequest to construct the correct headers based on the spdy protocol…

net/spdy/spdy_proxy_client_socket.cc

 // Copyright (c) 2012 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_proxy_client_socket.h"
 
 #include <algorithm>  // min
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 354 matching lines @@
   if (net_log_.IsLoggingAllEvents()) {
     net_log_.AddEvent(
         NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
         make_scoped_refptr(new NetLogHttpRequestParameter(
             request_line, request_headers)));
   }
 
   request_.extra_headers.MergeFrom(request_headers);
   linked_ptr<spdy::SpdyHeaderBlock> headers(new spdy::SpdyHeaderBlock());
   CreateSpdyHeadersFromHttpRequest(request_, request_headers, headers.get(),
-                                   true);
-  // Reset the URL to be the endpoint of the connection
-  (*headers)["url"] = endpoint_.ToString();
-  headers->erase("scheme");
+                                   spdy_stream_->GetProtocolVersion(), true);
+    // Reset the URL to be the endpoint of the connection
+  if (spdy_stream_->GetProtocolVersion() > 2) {

[ramant (doing other things), 2012/03/15 05:41:34]

nit: Please move comment left by 2 spaces. (duplicated comment?)

[Ryan Hamilton, 2012/03/15 16:38:06]

Done.

+    (*headers)[":path"] = endpoint_.ToString();
+    headers->erase(":scheme");
+  } else {
+    // Reset the URL to be the endpoint of the connection
+    (*headers)["url"] = endpoint_.ToString();
+    headers->erase("scheme");
+  }
   spdy_stream_->set_spdy_headers(headers);
 
   return spdy_stream_->SendRequest(true);
 }
 
 int SpdyProxyClientSocket::DoSendRequestComplete(int result) {
   if (result < 0)
     return result;
 
   // Wait for SYN_REPLY frame from the server
@@ skipping 150 matching lines @@
   }
   // This may have been deleted by read_callback_, so check first.
   if (weak_ptr && !write_callback.is_null())
     write_callback.Run(ERR_CONNECTION_CLOSED);
 }
 
 void SpdyProxyClientSocket::set_chunk_callback(ChunkCallback* /*callback*/) {
 }
 
 }  // namespace net