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

net/spdy/spdy_stream.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_stream.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 422 matching lines @@
   DoLoop(bytes);
 }
 
 void SpdyStream::OnChunkAvailable() {
   DCHECK(io_state_ == STATE_SEND_HEADERS || io_state_ == STATE_SEND_BODY ||
          io_state_ == STATE_SEND_BODY_COMPLETE);
   if (io_state_ == STATE_SEND_BODY)
     OnWriteComplete(0);
 }
 
+int SpdyStream::GetProtocolVersion() const {
+  return session_->GetProtocolVersion();
+}
+
 void SpdyStream::LogStreamError(int status, const std::string& description) {
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_STREAM_ERROR,
       make_scoped_refptr(
           new NetLogSpdyStreamErrorParameter(stream_id_, status, description)));
 }
 
 void SpdyStream::OnClose(int status) {
   io_state_ = STATE_DONE;
   response_status_ = status;
@@ skipping 56 matching lines @@
 bool SpdyStream::HasUrl() const {
   if (pushed_)
     return response_received();
   return request_.get() != NULL;
 }
 
 GURL SpdyStream::GetUrl() const {
   DCHECK(HasUrl());
 
   if (pushed_) {
-    // assemble from the response
-    std::string url;
-    spdy::SpdyHeaderBlock::const_iterator it;
-    it = response_->find("url");
-    if (it != (*response_).end())
-      url = it->second;
-    return GURL(url);
+    if (GetProtocolVersion() >= 3) {
+      return GetUrlFromHeaderBlock(response_);
+    } else {
+      // assemble from the response
+      std::string url;
+      spdy::SpdyHeaderBlock::const_iterator it;
+      it = response_->find("url");
+      if (it != (*response_).end())
+        url = it->second;
+      return GURL(url);
+    }
   }
 
-  // assemble from the request
+  return GetUrlFromHeaderBlock(request_);
+}
+
+GURL SpdyStream::GetUrlFromHeaderBlock(
+    const linked_ptr<spdy::SpdyHeaderBlock>& headers) const {
+  const char* scheme_header = GetProtocolVersion() >= 3 ? ":scheme" : "scheme";
+  const char* host_header = GetProtocolVersion() >= 3 ? ":host" : "host";
+  const char* path_header = GetProtocolVersion() >= 3 ? ":path" : "path";
+
   std::string scheme;
   std::string host_port;
   std::string path;
   spdy::SpdyHeaderBlock::const_iterator it;
-  it = request_->find("scheme");
-  if (it != (*request_).end())
+  it = headers->find(scheme_header);
+  if (it != (*headers).end())
     scheme = it->second;
-  it = request_->find("host");
-  if (it != (*request_).end())
+  it = headers->find(host_header);
+  if (it != (*headers).end())
     host_port = it->second;
-  it = request_->find("path");
-  if (it != (*request_).end())
+  it = headers->find(path_header);
+  if (it != (*headers).end())
     path = it->second;
   std::string url = scheme + "://" + host_port + path;
   return GURL(url);
 }
 
 void SpdyStream::OnGetOriginBoundCertComplete(int result) {
   DCHECK_EQ(STATE_GET_ORIGIN_BOUND_CERT_COMPLETE, io_state_);
   DoLoop(result);
 }
 
@@ skipping 207 matching lines @@
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamDownloadTime",
       recv_last_byte_time_ - recv_first_byte_time_);
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamTime",
       recv_last_byte_time_ - send_time_);
 
   UMA_HISTOGRAM_COUNTS("Net.SpdySendBytes", send_bytes_);
   UMA_HISTOGRAM_COUNTS("Net.SpdyRecvBytes", recv_bytes_);
 }
 
 }  // namespace net