Killing off QUICv12, including cleaning out all of the code for handling

net/quic/quic_data_stream.cc

Index: net/quic/quic_data_stream.cc
diff --git a/net/quic/quic_data_stream.cc b/net/quic/quic_data_stream.cc
index 647bf9aa9cd863371981207b366a9151f8324320..c7824b425db166359e4e2973a7af7001fe660638 100644
--- a/net/quic/quic_data_stream.cc
+++ b/net/quic/quic_data_stream.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "net/quic/quic_session.h"
-#include "net/quic/quic_spdy_decompressor.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_write_blocked_list.h"
 
@@ -25,26 +24,6 @@ namespace {
 // priority in the middle.
 QuicPriority kDefaultPriority = 3;
 
-// Appends bytes from data into partial_data_buffer.  Once partial_data_buffer
-// reaches 4 bytes, copies the data into 'result' and clears
-// partial_data_buffer.
-// Returns the number of bytes consumed.
-uint32 StripUint32(const char* data, uint32 data_len,
-                   string* partial_data_buffer,
-                   uint32* result) {
-  DCHECK_GT(4u, partial_data_buffer->length());
-  size_t missing_size = 4 - partial_data_buffer->length();
-  if (data_len < missing_size) {
-    StringPiece(data, data_len).AppendToString(partial_data_buffer);
-    return data_len;
-  }
-  StringPiece(data, missing_size).AppendToString(partial_data_buffer);
-  DCHECK_EQ(4u, partial_data_buffer->length());
-  memcpy(result, partial_data_buffer->data(), 4);
-  partial_data_buffer->clear();
-  return missing_size;
-}
-
 }  // namespace
 
 QuicDataStream::QuicDataStream(QuicStreamId id,
@@ -53,15 +32,12 @@ QuicDataStream::QuicDataStream(QuicStreamId id,
       visitor_(NULL),
       headers_decompressed_(false),
       priority_(kDefaultPriority),
-      headers_id_(0),
       decompression_failed_(false),
       priority_parsed_(false) {
   DCHECK_NE(kCryptoStreamId, id);
-  if (version() > QUIC_VERSION_12) {
-    // Don't receive any callbacks from the sequencer until headers
-    // are complete.
-    sequencer()->SetBlockedUntilFlush();
-  }
+  // Don't receive any callbacks from the sequencer until headers
+  // are complete.
+  sequencer()->SetBlockedUntilFlush();
 }
 
 QuicDataStream::~QuicDataStream() {
@@ -138,10 +114,6 @@ QuicPriority QuicDataStream::EffectivePriority() const {
 }
 
 uint32 QuicDataStream::ProcessRawData(const char* data, uint32 data_len) {
-  if (version() <= QUIC_VERSION_12) {
-    return ProcessRawData12(data, data_len);
-  }
-
   if (!FinishedReadingHeaders()) {
     LOG(DFATAL) << "ProcessRawData called before headers have been finished";
     return 0;
@@ -149,106 +121,10 @@ uint32 QuicDataStream::ProcessRawData(const char* data, uint32 data_len) {
   return ProcessData(data, data_len);
 }
 
-uint32 QuicDataStream::ProcessRawData12(const char* data, uint32 data_len) {
-  DCHECK_NE(0u, data_len);
-
-  uint32 total_bytes_consumed = 0;
-  if (headers_id_ == 0u) {
-    total_bytes_consumed += StripPriorityAndHeaderId(data, data_len);
-    data += total_bytes_consumed;
-    data_len -= total_bytes_consumed;
-    if (data_len == 0 || total_bytes_consumed == 0) {
-      return total_bytes_consumed;
-    }
-  }
-  DCHECK_NE(0u, headers_id_);
-
-  // Once the headers are finished, we simply pass the data through.
-  if (headers_decompressed_) {
-    // Some buffered header data remains.
-    if (!decompressed_headers_.empty()) {
-      ProcessHeaderData();
-    }
-    if (decompressed_headers_.empty()) {
-      DVLOG(1) << "Delegating procesing to ProcessData";
-      total_bytes_consumed += ProcessData(data, data_len);
-    }
-    return total_bytes_consumed;
-  }
-
-  QuicHeaderId current_header_id =
-      session()->decompressor()->current_header_id();
-  // Ensure that this header id looks sane.
-  if (headers_id_ < current_header_id ||
-      headers_id_ > kMaxHeaderIdDelta + current_header_id) {
-    DVLOG(1) << ENDPOINT
-             << "Invalid headers for stream: " << id()
-             << " header_id: " << headers_id_
-             << " current_header_id: " << current_header_id;
-    session()->connection()->SendConnectionClose(QUIC_INVALID_HEADER_ID);
-    return total_bytes_consumed;
-  }
-
-  // If we are head-of-line blocked on decompression, then back up.
-  if (current_header_id != headers_id_) {
-    session()->MarkDecompressionBlocked(headers_id_, id());
-    DVLOG(1) << ENDPOINT
-             << "Unable to decompress header data for stream: " << id()
-             << " header_id: " << headers_id_;
-    return total_bytes_consumed;
-  }
-
-  // Decompressed data will be delivered to decompressed_headers_.
-  size_t bytes_consumed = session()->decompressor()->DecompressData(
-      StringPiece(data, data_len), this);
-  DCHECK_NE(0u, bytes_consumed);
-  if (bytes_consumed > data_len) {
-    DCHECK(false) << "DecompressData returned illegal value";
-    OnDecompressionError();
-    return total_bytes_consumed;
-  }
-  total_bytes_consumed += bytes_consumed;
-  data += bytes_consumed;
-  data_len -= bytes_consumed;
-
-  if (decompression_failed_) {
-    // The session will have been closed in OnDecompressionError.
-    return total_bytes_consumed;
-  }
-
-  // Headers are complete if the decompressor has moved on to the
-  // next stream.
-  headers_decompressed_ =
-      session()->decompressor()->current_header_id() != headers_id_;
-  if (!headers_decompressed_) {
-    DCHECK_EQ(0u, data_len);
-  }
-
-  ProcessHeaderData();
-
-  if (!headers_decompressed_ || !decompressed_headers_.empty()) {
-    return total_bytes_consumed;
-  }
-
-  // We have processed all of the decompressed data but we might
-  // have some more raw data to process.
-  if (data_len > 0) {
-    total_bytes_consumed += ProcessData(data, data_len);
-  }
-
-  // The sequencer will push any additional buffered frames if this data
-  // has been completely consumed.
-  return total_bytes_consumed;
-}
-
 const IPEndPoint& QuicDataStream::GetPeerAddress() {
   return session()->peer_address();
 }
 
-QuicSpdyCompressor* QuicDataStream::compressor() {
-  return session()->compressor();
-}
-
 bool QuicDataStream::GetSSLInfo(SSLInfo* ssl_info) {
   return session()->GetSSLInfo(ssl_info);
 }
@@ -268,58 +144,7 @@ uint32 QuicDataStream::ProcessHeaderData() {
   return bytes_processed;
 }
 
-void QuicDataStream::OnDecompressorAvailable() {
-  DCHECK_LE(QUIC_VERSION_12, version());
-  DCHECK_EQ(headers_id_,
-            session()->decompressor()->current_header_id());
-  DCHECK(!headers_decompressed_);
-  DCHECK(!decompression_failed_);
-  DCHECK_EQ(0u, decompressed_headers_.length());
-
-  while (!headers_decompressed_) {
-    struct iovec iovec;
-    if (sequencer()->GetReadableRegions(&iovec, 1) == 0) {
-      return;
-    }
-
-    size_t bytes_consumed = session()->decompressor()->DecompressData(
-        StringPiece(static_cast<char*>(iovec.iov_base),
-                    iovec.iov_len),
-        this);
-    DCHECK_LE(bytes_consumed, iovec.iov_len);
-    if (decompression_failed_) {
-      return;
-    }
-    sequencer()->MarkConsumed(bytes_consumed);
-
-    headers_decompressed_ =
-        session()->decompressor()->current_header_id() != headers_id_;
-  }
-
-  // Either the headers are complete, or the all data as been consumed.
-  ProcessHeaderData();  // Unprocessed headers remain in decompressed_headers_.
-  if (IsDoneReading()) {
-    OnFinRead();
-  } else if (FinishedReadingHeaders()) {
-    sequencer()->FlushBufferedFrames();
-  }
-}
-
-bool QuicDataStream::OnDecompressedData(StringPiece data) {
-  DCHECK_GE(QUIC_VERSION_12, version());
-  data.AppendToString(&decompressed_headers_);
-  return true;
-}
-
-void QuicDataStream::OnDecompressionError() {
-  DCHECK_LE(QUIC_VERSION_12, version());
-  DCHECK(!decompression_failed_);
-  decompression_failed_ = true;
-  session()->connection()->SendConnectionClose(QUIC_DECOMPRESSION_FAILURE);
-}
-
 void QuicDataStream::OnStreamHeaders(StringPiece headers_data) {
-  DCHECK_LT(QUIC_VERSION_12, version());
   headers_data.AppendToString(&decompressed_headers_);
   ProcessHeaderData();
 }
@@ -330,7 +155,6 @@ void QuicDataStream::OnStreamHeadersPriority(QuicPriority priority) {
 }
 
 void QuicDataStream::OnStreamHeadersComplete(bool fin, size_t frame_len) {
-  DCHECK_LT(QUIC_VERSION_12, version());
   headers_decompressed_ = true;
   if (fin) {
     sequencer()->OnStreamFrame(QuicStreamFrame(id(), fin, 0, IOVector()));
@@ -353,40 +177,8 @@ void QuicDataStream::OnClose() {
   }
 }
 
-uint32 QuicDataStream::StripPriorityAndHeaderId(
-    const char* data, uint32 data_len) {
-  uint32 total_bytes_parsed = 0;
-
-  if (!priority_parsed_ && session()->connection()->is_server()) {
-    QuicPriority temporary_priority = priority_;
-    total_bytes_parsed = StripUint32(
-        data, data_len, &headers_id_and_priority_buffer_, &temporary_priority);
-    if (total_bytes_parsed > 0 && headers_id_and_priority_buffer_.size() == 0) {
-      priority_parsed_ = true;
-
-      // Spdy priorities are inverted, so the highest numerical value is the
-      // lowest legal priority.
-      if (temporary_priority > QuicUtils::LowestPriority()) {
-        session()->connection()->SendConnectionClose(QUIC_INVALID_PRIORITY);
-        return 0;
-      }
-      priority_ = temporary_priority;
-    }
-    data += total_bytes_parsed;
-    data_len -= total_bytes_parsed;
-  }
-  if (data_len > 0 && headers_id_ == 0u) {
-    // The headers ID has not yet been read.  Strip it from the beginning of
-    // the data stream.
-    total_bytes_parsed += StripUint32(
-        data, data_len, &headers_id_and_priority_buffer_, &headers_id_);
-  }
-  return total_bytes_parsed;
-}
-
 bool QuicDataStream::FinishedReadingHeaders() {
-  return (headers_id_ != 0 || version() > QUIC_VERSION_12) &&
-      headers_decompressed_ && decompressed_headers_.empty();
+  return headers_decompressed_ && decompressed_headers_.empty();
 }
 
 void QuicDataStream::OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) {