Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: net/quic/core/spdy_utils.cc

Issue 2544813002: Remove enum SpdyMajorVersion. (Closed)
Patch Set: Merge comment changes from 140661724. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_headers_stream_test.cc ('k') | net/quic/test_tools/quic_test_packet_maker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/spdy_utils.cc
diff --git a/net/quic/core/spdy_utils.cc b/net/quic/core/spdy_utils.cc
index 222001368ffadb8a9cf05eef4a18c75aefd6d32b..c57f0b5321eb2437f0a9573001c9e87892fe28e7 100644
--- a/net/quic/core/spdy_utils.cc
+++ b/net/quic/core/spdy_utils.cc
@@ -27,11 +27,9 @@ namespace net {
// static
string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) {
- SpdyMajorVersion spdy_version = HTTP2;
-
- size_t length = SpdyFramer::GetSerializedLength(spdy_version, &headers);
- SpdyFrameBuilder builder(length, spdy_version);
- SpdyFramer framer(spdy_version);
+ size_t length = SpdyFramer::GetSerializedLength(&headers);
+ SpdyFrameBuilder builder(length);
+ SpdyFramer framer;
framer.SerializeHeaderBlockWithoutCompression(&builder, headers);
SpdySerializedFrame block(builder.take());
return string(block.data(), length);
@@ -42,7 +40,7 @@ bool SpdyUtils::ParseHeaders(const char* data,
uint32_t data_len,
int64_t* content_length,
SpdyHeaderBlock* headers) {
- SpdyFramer framer(HTTP2);
+ SpdyFramer framer;
if (!framer.ParseHeaderBlockInBuffer(data, data_len, headers) ||
headers->empty()) {
return false; // Headers were invalid.
@@ -93,7 +91,7 @@ bool SpdyUtils::ParseTrailers(const char* data,
uint32_t data_len,
size_t* final_byte_offset,
SpdyHeaderBlock* trailers) {
- SpdyFramer framer(HTTP2);
+ SpdyFramer framer;
if (!framer.ParseHeaderBlockInBuffer(data, data_len, trailers) ||
trailers->empty()) {
DVLOG(1) << "Request Trailers are invalid.";
« no previous file with comments | « net/quic/core/quic_headers_stream_test.cc ('k') | net/quic/test_tools/quic_test_packet_maker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698