Remove many-many SpdyMajorVersion and NextProto arguments and members.

net/spdy/spdy_http_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_http_stream.h"
 
 #include <algorithm>
 #include <list>
 #include <utility>
 
@@ skipping 257 matching lines @@
     // Pushed streams do not send any data, and should always be
     // idle. However, we still want to return ERR_IO_PENDING to mimic
     // non-push behavior. The callback will be called when the
     // response is received.
     CHECK(response_callback_.is_null());
     response_callback_ = callback;
     return ERR_IO_PENDING;
   }
 
   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,
       base::Bind(&SpdyHeaderBlockNetLogCallback, headers.get()));
   result = stream_->SendRequestHeaders(
       std::move(headers),
       HasUploadData() ? MORE_DATA_TO_SEND : NO_MORE_DATA_TO_SEND);
 
   if (result == ERR_IO_PENDING) {
     CHECK(request_callback_.is_null());
@@ skipping 23 matching lines @@
 SpdyResponseHeadersStatus SpdyHttpStream::OnResponseHeadersUpdated(
     const SpdyHeaderBlock& response_headers) {
   CHECK_EQ(response_headers_status_, RESPONSE_HEADERS_ARE_INCOMPLETE);
 
   if (!response_info_) {
     DCHECK_EQ(stream_->type(), SPDY_PUSH_STREAM);
     push_response_info_.reset(new HttpResponseInfo);
     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;
   }
 
   response_info_->response_time = stream_->response_time();
   response_headers_status_ = RESPONSE_HEADERS_ARE_COMPLETE;
   // Don't store the SSLInfo in the response here, HttpNetworkTransaction
   // will take care of that part.
   SSLInfo ssl_info;
   NextProto protocol_negotiated = kProtoUnknown;
   stream_->GetSSLInfo(&ssl_info,
                       &response_info_->was_npn_negotiated,
                       &protocol_negotiated);
   response_info_->npn_negotiated_protocol =
       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());
 
   if (!response_callback_.is_null()) {
     DoResponseCallback(OK);
   }
 
   return RESPONSE_HEADERS_ARE_COMPLETE;
 }
 
@@ skipping 253 matching lines @@
   details->connection_info = HttpResponseInfo::CONNECTION_INFO_HTTP2;
   return;
 }
 
 void SpdyHttpStream::SetPriority(RequestPriority priority) {
   // TODO(akalin): Plumb this through to |stream_request_| and
   // |stream_|.
 }
 
 }  // namespace net