Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/tools/quic/spdy_balsa_utils.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/tools/quic/spdy_balsa_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 249 matching lines @@
     } else {
       path = request_uri->path();
       if (!request_uri->query().empty()) {
         path = path + "?" + request_uri->query();
       }
       host_and_port = request_uri->host();
       scheme = request_uri->scheme();
     }
   }
 
-  DCHECK(!scheme.empty());
-  DCHECK(!host_and_port.empty());
-  DCHECK(!path.empty());
+  if (scheme.empty()) {
+    if (request_headers.HasHeader("Scheme")) {
+      request_headers.GetAllOfHeaderAsString("Scheme", &scheme);
+    } else {
+      // Requests must contain a :scheme header, and unless another scheme is
+      // detected, https is assumed.
+      scheme = "https";
+    }
+  }
 
   SpdyHeaderBlock block;
   PopulateHttp2RequestHeaderBlock(request_headers, scheme, host_and_port, path,
                                   &block);
+
+  // If a "Scheme" header existed in request_headers, it would have been
+  // propagated to |block|.
+  block.erase("scheme");
   return block;
 }
 
 // static
 SpdyHeaderBlock SpdyBalsaUtils::ResponseHeadersToSpdyHeaders(
     const BalsaHeaders& response_headers) {
   SpdyHeaderBlock block;
   PopulateSpdyResponseHeaderBlock(HTTP2, response_headers, &block);
   return block;
 }
@@ skipping 12 matching lines @@
   SpdyHeadersToBalsaHeaders(block, headers, true);
 }
 
 // static
 void SpdyBalsaUtils::SpdyHeadersToRequestHeaders(const SpdyHeaderBlock& block,
                                                  BalsaHeaders* headers) {
   SpdyHeadersToBalsaHeaders(block, headers, false);
 }
 
 }  // namespace net