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

Unified Diff: net/spdy/spdy_http_stream.cc

Issue 2141993002: Remove many-many SpdyMajorVersion and NextProto arguments and members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove OnSynStream() and OnSynReply(). Created 4 years, 5 months 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/spdy/header_coalescer.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_http_stream.cc
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index ea5be19c72b47831c4b5a02ffb0da9906ca91439..e823675016fbd44eb68014428ad917fb0a8c9e42 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -275,8 +275,7 @@ int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
}
std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
- CreateSpdyHeadersFromHttpRequest(*request_info_, request_headers,
- stream_->GetProtocolVersion(), direct_,
+ CreateSpdyHeadersFromHttpRequest(*request_info_, request_headers, direct_,
headers.get());
stream_->net_log().AddEvent(
NetLog::TYPE_HTTP_TRANSACTION_HTTP2_SEND_REQUEST_HEADERS,
@@ -320,8 +319,7 @@ SpdyResponseHeadersStatus SpdyHttpStream::OnResponseHeadersUpdated(
response_info_ = push_response_info_.get();
}
- if (!SpdyHeadersToHttpResponse(
- response_headers, stream_->GetProtocolVersion(), response_info_)) {
+ if (!SpdyHeadersToHttpResponse(response_headers, response_info_)) {
// We do not have complete headers yet.
return RESPONSE_HEADERS_ARE_INCOMPLETE;
}
@@ -339,7 +337,7 @@ SpdyResponseHeadersStatus SpdyHttpStream::OnResponseHeadersUpdated(
SSLClientSocket::NextProtoToString(protocol_negotiated);
response_info_->request_time = stream_->GetRequestTime();
response_info_->connection_info =
- HttpResponseInfo::ConnectionInfoFromNextProto(stream_->GetProtocol());
+ HttpResponseInfo::ConnectionInfoFromNextProto(kProtoHTTP2);
response_info_->vary_data
.Init(*request_info_, *response_info_->headers.get());
« no previous file with comments | « net/spdy/header_coalescer.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698