Remove many-many SpdyMajorVersion and NextProto arguments and members.

net/spdy/spdy_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_stream.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 613 matching lines @@
   pending_send_data_->DidConsume(frame_payload_size);
   if (pending_send_data_->BytesRemaining() > 0) {
     QueueNextDataFrame();
     return ERR_IO_PENDING;
   } else {
     pending_send_data_ = NULL;
     return OK;
   }
 }
 
-SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
-  return session_->GetProtocolVersion();
-}
-
 void SpdyStream::LogStreamError(int status, const std::string& description) {
   net_log_.AddEvent(NetLog::TYPE_HTTP2_STREAM_ERROR,
                     base::Bind(&NetLogSpdyStreamErrorCallback, stream_id_,
                                status, &description));
 }
 
 void SpdyStream::OnClose(int status) {
   // In most cases, the stream should already be CLOSED. The exception is when a
   // SpdySession is shutting down while the stream is in an intermediate state.
   io_state_ = STATE_CLOSED;
@@ skipping 100 matching lines @@
 }
 
 bool SpdyStream::IsOpen() const {
   return io_state_ == STATE_OPEN;
 }
 
 bool SpdyStream::IsReservedRemote() const {
   return io_state_ == STATE_RESERVED_REMOTE;
 }
 
-NextProto SpdyStream::GetProtocol() const {
-  return session_->protocol();
-}
-
 void SpdyStream::AddRawReceivedBytes(size_t received_bytes) {
   raw_received_bytes_ += received_bytes;
 }
 
 void SpdyStream::AddRawSentBytes(size_t sent_bytes) {
   raw_sent_bytes_ += sent_bytes;
 }
 
 bool SpdyStream::GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const {
   if (stream_id_ == 0)
     return false;
   bool result = session_->GetLoadTimingInfo(stream_id_, load_timing_info);
   if (type_ == SPDY_PUSH_STREAM) {
     load_timing_info->push_start = recv_first_byte_time_;
     bool done_receiving = IsClosed() || (!pending_recv_data_.empty() &&
                                          !pending_recv_data_.back());
     if (done_receiving)
       load_timing_info->push_end = recv_last_byte_time_;
   }
   return result;
 }
 
 GURL SpdyStream::GetUrlFromHeaders() const {
   if (!request_headers_)
     return GURL();
 
-  return GetUrlFromHeaderBlock(*request_headers_, GetProtocolVersion());
+  return GetUrlFromHeaderBlock(*request_headers_);
 }
 
 bool SpdyStream::HasUrlFromHeaders() const {
   return !GetUrlFromHeaders().is_empty();
 }
 
 void SpdyStream::UpdateHistograms() {
   // We need at least the receive timers to be filled in, as otherwise
   // metrics can be bogus.
   if (recv_first_byte_time_.is_null() || recv_last_byte_time_.is_null())
@@ skipping 146 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net