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

net/tools/quic/spdy_balsa_utils.cc

Index: net/tools/quic/spdy_balsa_utils.cc
diff --git a/net/tools/quic/spdy_balsa_utils.cc b/net/tools/quic/spdy_balsa_utils.cc
index e045af9225e0e2f76c320618e23fd95a05f7893d..509b3f61c731b626fe71cb99881ea3a96c8449c0 100644
--- a/net/tools/quic/spdy_balsa_utils.cc
+++ b/net/tools/quic/spdy_balsa_utils.cc
@@ -267,13 +267,23 @@ SpdyHeaderBlock SpdyBalsaUtils::RequestHeadersToSpdyHeaders(
     }
   }
 
-  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;
 }